Merge branch 'release/67.0.3396.87'

0002-fix-building-without-reporting.patch

@@ -12,10 +12,10 @@
      net::URLRequestContext* request_context =
          request_context_getter_->GetURLRequestContext();
      if (!request_context) {
-@@ -117,6 +118,7 @@ class ReportingServiceProxyImpl : public
-     }
-
-     reporting_service->QueueReport(url, group, type, std::move(body));
+@@ -120,6 +121,7 @@ class ReportingServiceProxyImpl : public
+     // renderer.
+     reporting_service->QueueReport(url, group, type, std::move(body),
+                                    /* depth= */ 0);
 +#endif
    }
 
@@ -40,7 +40,7 @@
    mutable std::unique_ptr<LazyParams> lazy_params_;
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -630,7 +630,9 @@ void ProfileIOData::AppRequestContext::S
+@@ -623,7 +623,9 @@ void ProfileIOData::AppRequestContext::S
  void ProfileIOData::AppRequestContext::SetReportingService(
      std::unique_ptr<net::ReportingService> reporting_service) {
    reporting_service_ = std::move(reporting_service);
@@ -52,7 +52,7 @@
  void ProfileIOData::AppRequestContext::SetNetworkErrorLoggingService(
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -268,10 +268,12 @@ void ClearReportingCacheOnIOThread(
+@@ -271,10 +271,12 @@ void ClearReportingCacheOnIOThread(
      const base::RepeatingCallback<bool(const GURL&)>& origin_filter) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
 

0004-disable-google-url-tracker.patch

@@ -12,7 +12,7 @@
 
  GoogleURLTracker::GoogleURLTracker(
      std::unique_ptr<GoogleURLTrackerClient> client,
-@@ -143,83 +143,4 @@ void GoogleURLTracker::FinishSleep() {
+@@ -145,83 +145,4 @@ void GoogleURLTracker::FinishSleep() {
  }
 
  void GoogleURLTracker::StartFetchIfDesirable() {

0006-modify-default-prefs.patch

@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -856,7 +856,7 @@ void ChromeContentBrowserClient::Registe
+@@ -966,7 +966,7 @@ void ChromeContentBrowserClient::Registe
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -11,7 +11,7 @@
    // user policy in addition to the same named ones in Local State (which are
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -65,11 +65,11 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -49,7 +49,7 @@
  enum class NetworkPredictionStatus {
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPref
+@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPref
    registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
    registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
  #endif
@@ -60,7 +60,7 @@
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -100,7 +100,7 @@ void CookieSettings::GetCookieSettings(
+@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -82,7 +82,7 @@
 
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -215,7 +215,7 @@ void AutofillManager::RegisterProfilePre
+@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePre
    registry->RegisterIntegerPref(
        prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
    registry->RegisterBooleanPref(
@@ -101,10 +101,10 @@
 +        <paper-checkbox id="sendSettings">
            $i18nRaw{resetPageFeedback}</paper-checkbox>
        </div>
-     </dialog>
+     </cr-dialog>
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -629,7 +629,7 @@ void IOThread::RegisterPrefs(PrefRegistr
+@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistr
                                 std::string());
    registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
    data_reduction_proxy::RegisterPrefs(registry);
@@ -180,7 +180,7 @@
  }
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtension
+@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtension
    if (is_theme())
      return false;
 
@@ -197,7 +197,7 @@
    // functionality that are only available in chrome://extensions/ but which
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySi
+@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySi
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(
@@ -222,5 +222,5 @@
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
    registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+                                PrefRegistry::NO_REGISTRATION_FLAGS);

0007-disable-web-resource-service.patch

@@ -1,6 +1,6 @@
 --- a/components/web_resource/web_resource_service.cc
 +++ b/components/web_resource/web_resource_service.cc
-@@ -128,44 +128,7 @@ bool WebResourceService::GetFetchSchedul
+@@ -127,44 +127,7 @@ bool WebResourceService::GetFetchSchedul
  // Initializes the fetching of data from the resource server.  Data
  // load calls OnURLFetchComplete.
  void WebResourceService::StartFetch() {

0012-branding.patch

@@ -1,6 +1,6 @@
 --- a/chrome/common/chrome_paths_linux.cc
 +++ b/chrome/common/chrome_paths_linux.cc
-@@ -87,11 +87,7 @@ bool GetDefaultUserDataDirectory(base::F
+@@ -87,11 +87,7 @@
          GetXDGDirectory(env.get(), kXdgConfigHomeEnvVar, kDotConfigDir);
    }
 
@@ -15,7 +15,7 @@
 
 --- a/chrome/app/chromium_strings.grd
 +++ b/chrome/app/chromium_strings.grd
-@@ -130,10 +130,10 @@ If you update this file, be sure also to
+@@ -130,10 +130,10 @@
          Disconnecting <ph name="USERNAME">$1<ex>[email protected]</ex></ph> will clear your history, bookmarks, settings, and other Chromium data stored on this device. Data stored in your Google Account will not be cleared and can be managed on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph>Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>.
        </message>
        <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
@@ -28,7 +28,7 @@
        </message>
        <if expr="is_win">
          <message name="IDS_SXS_SHORTCUT_NAME" desc="Unused in Chromium builds" translateable="false">
-@@ -143,7 +143,7 @@ If you update this file, be sure also to
+@@ -143,7 +143,7 @@
          <message name="IDS_SHORTCUT_NAME_DEV" desc="Unused in Chromium builds" translateable="false">
          </message>
          <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
@@ -37,7 +37,7 @@
          </message>
        </if>
        <if expr="chromeos">
-@@ -166,7 +166,7 @@ If you update this file, be sure also to
+@@ -166,7 +166,7 @@
          sign in to Chromium
        </message>
        <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window">
@@ -46,25 +46,7 @@
        </message>
        <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
          Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
-@@ -174,7 +174,7 @@ If you update this file, be sure also to
-       <if expr="not chromeos">
-         <!-- Browser Window Title Format -->
-         <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows">
--          <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium
-+          <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Inox
-         </message>
-       </if>
-       <if expr="chromeos">
-@@ -266,7 +266,7 @@ If you update this file, be sure also to
-       </if>
-       <if expr="not chromeos">
-         <message name="IDS_OPTIONS_RELAUNCH_REQUIRED" desc="The message displayed for an option that requires a relaunch to take effect. This appears in a message box if an option is changed that requires a relaunch.">
--          Please close all Chromium windows and relaunch Chromium for this change to take effect.
-+          Please close all Inox windows and relaunch Inox for this change to take effect.
-         </message>
-       </if>
-       <if expr="chromeos">
-@@ -595,7 +595,7 @@ Chromium is unable to recover your setti
+@@ -590,7 +590,7 @@
 
        <if expr="use_titlecase and not chromeos">
          <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
@@ -73,7 +55,7 @@
          </message>
          <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
            Update &amp;Chromium
-@@ -603,7 +603,7 @@ Chromium is unable to recover your setti
+@@ -598,7 +598,7 @@
        </if>
        <if expr="not use_titlecase and not chromeos">
          <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
@@ -82,7 +64,7 @@
          </message>
          <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
            Update &amp;Chromium
-@@ -620,7 +620,7 @@ Chromium is unable to recover your setti
+@@ -615,7 +615,7 @@
 
        <if expr="is_macosx">
          <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
@@ -93,7 +75,7 @@
            Chromium Helper
 --- a/chrome/test/chromedriver/chrome/chrome_finder.cc
 +++ b/chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -91,15 +91,12 @@ void GetApplicationDirs(std::vector<base
+@@ -94,15 +94,12 @@
  bool FindChrome(base::FilePath* browser_exe) {
    base::FilePath browser_exes_array[] = {
  #if defined(OS_WIN)
@@ -115,12 +97,12 @@
        base::FilePath()
 --- a/chrome/common/chrome_paths.cc
 +++ b/chrome/common/chrome_paths.cc
-@@ -58,7 +58,7 @@ const base::FilePath::CharType kFilepath
+@@ -59,7 +59,7 @@
  #if defined(GOOGLE_CHROME_BUILD)
      FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
  #else
 -    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
 +    FILE_PATH_LITERAL("/usr/share/inox/extensions");
  #endif  // defined(GOOGLE_CHROME_BUILD)
 
- // The path to the hint file that tells the pepper plugin loader
+ // The path to the hint file that tells the pepper plugin loader

0014-disable-translation-lang-fetch.patch

@@ -11,27 +11,27 @@
      request_pending_ = true;
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -158,7 +158,6 @@ void SpellcheckHunspellDictionary::Retry
+@@ -164,7 +164,6 @@ void SpellcheckHunspellDictionary::Retry
      return;
    }
-   request_context_getter_ = request_context_getter;
+   browser_context_ = browser_context;
 -  DownloadDictionary(GetDictionaryURL());
  }
 
  bool SpellcheckHunspellDictionary::IsReady() const {
-@@ -377,9 +376,6 @@ void SpellcheckHunspellDictionary::Initi
+@@ -401,9 +400,6 @@ void SpellcheckHunspellDictionary::Initi
      }
 
-     if (request_context_getter_) {
--      // Download from the UI thread to check that |request_context_getter_| is
+     if (browser_context_) {
+-      // Download from the UI thread to check that |browser_context_| is
 -      // still valid.
 -      DownloadDictionary(GetDictionaryURL());
        return;
      }
    }
 --- a/components/translate/core/browser/translate_ranker_impl.cc
 +++ b/components/translate/core/browser/translate_ranker_impl.cc
-@@ -150,14 +150,10 @@ TranslateRankerImpl::TranslateRankerImpl
+@@ -154,14 +154,10 @@ TranslateRankerImpl::TranslateRankerImpl
                                           ukm::UkmRecorder* ukm_recorder)
      : ukm_recorder_(ukm_recorder),
        is_logging_enabled_(false),
@@ -50,7 +50,7 @@
        weak_ptr_factory_(this) {
    if (is_query_enabled_ || is_enforcement_enabled_) {
      model_loader_ = std::make_unique<assist_ranker::RankerModelLoaderImpl>(
-@@ -231,6 +227,8 @@ bool TranslateRankerImpl::ShouldOfferTra
+@@ -235,6 +231,8 @@ bool TranslateRankerImpl::ShouldOfferTra
    // (or become False).
    const bool kDefaultResponse = true;
 

0017-disable-new-avatar-menu.patch

@@ -1,6 +1,6 @@
 --- a/components/signin/core/browser/signin_manager.cc
 +++ b/components/signin/core/browser/signin_manager.cc
-@@ -302,7 +302,7 @@ void SigninManager::OnGoogleServicesUser
+@@ -314,7 +314,7 @@ void SigninManager::OnGoogleServicesUser
  }
 
  bool SigninManager::IsSigninAllowed() const {

0020-launcher-branding.patch

@@ -7,8 +7,8 @@
 -CHROMIUM_NAME    = chromium$(CHROMIUM_SUFFIX)
 +CHROMIUM_NAME    = inox$(CHROMIUM_SUFFIX)
  CHROMIUM_BINARY  = /usr/lib/$(CHROMIUM_NAME)/$(CHROMIUM_NAME)
+ CHROMIUM_VENDOR  = $(shell . /etc/os-release; echo $$NAME)
  PEPPER_FLASH_DIR = /usr/lib/PepperFlash
-
 --- a/launcher.c
 +++ b/launcher.c
 @@ -85,7 +85,7 @@

0021-disable-rlz.patch

@@ -1,7 +1,7 @@
 # Disable rlz
 
---- a/rlz/features/features.gni
-+++ b/rlz/features/features.gni
+--- a/rlz/buildflags/buildflags.gni
++++ b/rlz/buildflags/buildflags.gni
 @@ -6,6 +6,6 @@ import("//build/config/chrome_build.gni"
 
  # Whether we are using the rlz library or not.  Platforms like Android send