Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x)

BUILD.gn

@@ -285,6 +285,7 @@ process_version("generate_version") {
   template_file = "version.version"
   extra_args = [ "-e", "BRAVE_BROWSER_VERSION=\"$brave_version\"" ]
   output = "$root_out_dir/version"
+  process_only = true
 }
 
 if (!is_android && !is_ios) {

DEPS

@@ -9,13 +9,13 @@ deps = {
   "vendor/requests": "https://github.com/kennethreitz/requests@e4d59bedfd3c7f4f254f4f5d036587bcd8152458",
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/techtonik/python-patch@2148d5408fafd5c05ac6854dd7deb4e8a4ca4a49",
-  "vendor/omaha":  "https://github.com/brave/omaha.git@22dec7e124881ba2c7e8f331d18d9c4dd40ed207",
+  "vendor/omaha":  "https://github.com/brave/omaha.git@de118d8511e4754a673d44a9f1e92d80442069e7",
   "vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0",
   "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@86aafe2ef89835ae71c9ed7c2527e3bb3000930e",
   "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@13bb40a215248cfbdd87d0a6b425c8397402e9e6",
   "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@e3742ba3e8942eea9e4755d91532491871bd3116",
   "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@1b4362968c8f22720bfb75af6f506d4ecc0f3116",
-  "components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@e97e9e912552cd789cb2c1b1f327c77b32175317",
+  "components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@91a68fdebc8962ca409045177438671f06a3c26a",
   "components/brave_sync/extension/brave-crypto": "https://github.com/brave/crypto@0231e65ba211b152d742278319c545a83cb13fc0",
   "vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@c1745b906079285fc01e3079ac49b0e65fde0f98",
   "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@2c0e28f76e4b6f53947bf4faa5afd93614f96aca",

android/brave_java_sources.gni

@@ -4,6 +4,6 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 brave_java_sources = [
-  "../../brave/android/java/org/chromium/chrome/browser/init/BraveBrowserInitializer.java",
-  "../../brave/android/java/org/chromium/chrome/browser/search_engines/BraveTemplateUrlService.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
 ]

app/android/BUILD.gn

@@ -2,22 +2,3 @@ import("//brave/build/config.gni")
 
 group("symbol_dist_resources") {}
 group("dist_resources") {}
-
-source_set("common_extensions") {
-  sources = [
-    "//extensions/common/error_utils.cc",
-    "//extensions/common/error_utils.h",
-    "//extensions/common/url_pattern.cc",
-    "//extensions/common/url_pattern.h",
-    "//extensions/common/url_pattern_set.cc",
-    "//extensions/common/url_pattern_set.h",
-  ]
-
-  deps = [
-    "//base",
-    "//components/url_pattern_index",
-    "//extensions/buildflags",
-    "//extensions/common:common_constants",
-    "//url",
-  ]
-}

app/app_management_strings.grdp

@@ -49,8 +49,8 @@
   <message name="IDS_APP_MANAGEMENT_PERMISSIONS" desc="Label for permissions section in the app settings page.">
     Permissions
   </message>
-  <message name="IDS_APP_MANAGEMENT_MORE_PERMISSIONS" desc="Label for a link to more permissions for an app.">
-    More permissions
+  <message name="IDS_APP_MANAGEMENT_MORE_SETTINGS" desc="Label for a link to more settings and permissions for an app.">
+    More settings and permissions
   </message>
   <message name="IDS_APP_MANAGEMENT_THIS_APP_CAN" desc="Label for permissions that a Brave app can use.">
     This app can:
@@ -76,4 +76,13 @@
   <message name="IDS_APP_MANAGEMENT_VERSION" desc="Label for version of an app in the app settings page.">
     Version: <ph name="VERSION">$1<ex>4.0</ex></ph>
   </message>
+  <message name="IDS_APP_MANAGEMENT_PIN_ENFORCED_BY_POLICY" desc="Short text for the pin/unpin context menu to tell user the setting is enforced by policy of an app.">
+    Pinned by administrator
+  </message>
+  <message name="IDS_APP_MANAGEMENT_CONTACTS" desc="Label for the Android contacts (address book) permission toggle.">
+    Contacts
+  </message>
+  <message name="IDS_APP_MANAGEMENT_STORAGE" desc="Label for the Android storage permission toggle.">
+    Storage
+  </message>
 </grit-part>

app/brave_main_delegate.cc

@@ -31,6 +31,7 @@
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/unified_consent/feature.h"
+#include "content/public/common/content_features.h"
 #include "extensions/common/extension_features.h"
 #include "services/network/public/cpp/features.h"
 #include "third_party/widevine/cdm/buildflags.h"
@@ -141,15 +142,19 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       extensions_features::kNewExtensionUpdaterService.name,
 #endif
+    // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated on
+    // this feature.
+      features::kWebUIDarkMode.name,
       omnibox::kSimplifyHttpsIndicator.name,
   };
 
   // Disabled features.
   const std::unordered_set<const char*> disabled_features = {
       autofill::features::kAutofillServerCommunication.name,
-      network::features::kNetworkService.name,
+      features::kAudioServiceOutOfProcess.name,
+      features::kLookalikeUrlNavigationSuggestionsUI.name,
       unified_consent::kUnifiedConsent.name,
-#if !defined(CHROME_MULTIPLE_DLL_CHILD) && !BUILDFLAG(ENABLE_BRAVE_TRANSLATE)
+#if !defined(CHROME_MULTIPLE_DLL_CHILD) && !BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
       translate::kTranslateUI.name,  // only available in browser process
 #endif
   };

app/brave_main_delegate_browsertest.cc

@@ -45,7 +45,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &autofill::features::kAutofillServerCommunication,
       &features::kAudioServiceOutOfProcess,
       &features::kDefaultEnableOopRasterization,
-      &network::features::kNetworkService,
       &unified_consent::kUnifiedConsent,
       &features::kLookalikeUrlNavigationSuggestionsUI,
   };

app/brave_strings.grd

@@ -589,7 +589,10 @@ Brave is unable to recover your settings.
         </message>
       </if>
       <if expr="chromeos">
-        <message name="IDS_ABOUT" desc="The text label of the About Brave OS menu item">
+        <message name="IDS_ABOUT" desc="The text label of the About Brave menu item">
+          About &amp;Brave
+        </message>
+        <message name="IDS_ABOUT_OS" desc="The text label of the About Brave OS menu item">
           About &amp;Brave OS
         </message>
         <message name="IDS_UPDATE_NOW" desc="The text label of the Update Brave OS Now menu item">
@@ -615,9 +618,6 @@ Brave is unable to recover your settings.
       </message>
 
       <!-- DICE sign-in promo strings -->
-      <message name="IDS_PROFILES_DICE_SIGNIN_PROMO" desc="Text describing the benefits of signing in and turning on Sync.">
-        Sign in to sync and personalize Brave across your devices
-      </message>
       <message name="IDS_PROFILES_DICE_SYNC_PROMO" desc="Text describing the benefits of turning on Sync.">
         Sync and personalize Brave across your devices
       </message>
@@ -737,6 +737,12 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe
           Brave OS could not sync your data due to an error signing in.
         </message>
       </if>
+      <message name="IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT" desc="Info text displayed in the user menu when sync is paused due to cookies cleared on exit.">
+        You clear cookies when you quit Brave. To keep syncing, change this <ph name="COOKIE_SETTINGS_LINK">$1<ex>settings</ex></ph>.
+      </message>
+      <message name="IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT_LINK_TEXT" desc="Link text part of the sync paused info text when sync is paused due to cookies cleared on exit.">
+        settings
+      </message>
 
       <if expr="is_android">
         <message name="IDS_AUTOFILL_DESCRIBE_LOCAL_COPY" desc="Text label that described a Wallet credit card which has been copied to the local Brave instance.">
@@ -1149,40 +1155,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
         <message name="IDS_WELCOME_HEADER" desc="A message which will appear as the header on the Welcome UI if the user has never run Brave before.">
           Welcome to Brave
         </message>
-        <message name="IDS_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A message which will appear as the header on the Welcome UI if the user has run Brave before.">
-          Take Brave everywhere
-        </message>
-        <message name="IDS_DICE_WELCOME_SECOND_HEADER" desc="A second message which will appear as the header on the Welcome UI if the user has never run Brave before.">
-          Web browsing with Brave smarts
-        </message>
-        <message name="IDS_DICE_WELCOME_DECLINE_BUTTON" desc="A button on the welcome page which declines the offer to sign in to Brave.">
-          Not now
-        </message>
-        <message name="IDS_DICE_WELCOME_DESCRIPTION" desc="A message on the welcome page explaining the purpose of signing in.">
-          Sync and personalize Brave across your devices
-        </message>
-      </if>
-
-      <!-- Windows 10 Welcome page strings -->
-      <if expr="is_win">
-        <message name="IDS_WIN10_WELCOME_HEADER" desc="A header on the Windows 10 Welcome UI if the user has never run Brave before.">
-          Welcome to Brave
-        </message>
-        <message name="IDS_WIN10_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A header on the Windows 10 Welcome UI if the user has run Brave before.">
-          Get to Brave faster
-        </message>
-        <message name="IDS_WIN10_WELCOME_MAKE_DEFAULT_SUBHEADING" desc="A subheading on a section which gives instructions on how to make Brave the default browser.">
-          Make Brave your default browser
-        </message>
-        <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Brave to the Windows 10 taskbar.">
-          Pin Brave to your taskbar
-        </message>
-        <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Brave from an external list of apps.">
-          Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Brave<ph name="END_BOLD">&lt;/strong&gt;</ph>
-        </message>
-        <message name="IDS_WIN10_WELCOME_CLICK_SWITCH_ANYWAY" desc="An instruction asking the user to click on the &quot;Switch anyway&quot; button. It's possible that the button doesn't appear for the user, hence the &quot;if it appears&quot;. The bold portion of this message must match IDS_WIN10_WELCOME_SWITCH_ANYWAY_LABEL.">
-          Click <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Switch anyway<ph name="END_BOLD">&lt;/strong&gt;</ph>, if it appears
-        </message>
       </if>
 
       <!-- Native notifications for Windows 10 -->
@@ -1247,6 +1219,12 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
       <message name="IDS_DESKTOP_MEDIA_PICKER_TITLE_WEB_CONTENTS_ONLY" desc="Title for the window picker dialog shown when desktop capture of a tab is requested by an app.">
         Share a Brave tab
       </message>
+      <!-- User happiness tracking survey UI -->
+      <if expr="not is_android">
+        <message name="IDS_HATS_BUBBLE_TITLE" translateable="false" desc="The title of Happiness Tracking Survey's invitation banner, it invites users to take a survey">
+          Help us improve Brave
+        </message>
+      </if>
     </messages>
   </release>
 </grit>