Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44

DEPS

@@ -14,7 +14,7 @@ deps = {
  "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",
+ "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@dd0c535898a645b84d6f3372b393bdad6746108c",
  "components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@e50a5810c12170ed0e9a9d2c9d69a5e05a77f837",
  "vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@a82acda22d8cb255d86ee28734efb8ad886e9a49",
  "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@f88d942ddfaf61a4a6703355a77c4ef71bc95c35",

android/java/org/chromium/chrome/browser/preferences/AppearancePreferences.java

@@ -14,7 +14,7 @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
-import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.ui.base.DeviceFormFactor;
 
 public class AppearancePreferences
@@ -48,10 +48,10 @@ public void onActivityCreated(Bundle savedInstanceState) {
  if (enableBottomToolbar == null) return;
 
  enableBottomToolbar.setOnPreferenceChangeListener(this);
- if (enableBottomToolbar instanceof ChromeSwitchPreferenceCompat) {
+ if (enableBottomToolbar instanceof ChromeSwitchPreference) {
  boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(
  ContextUtils.getApplicationContext());
- ((ChromeSwitchPreferenceCompat) enableBottomToolbar)
+ ((ChromeSwitchPreference) enableBottomToolbar)
  .setChecked(!isTablet
  && ChromePreferenceManager.getInstance().isBottomToolbarEnabled());
  }

android/java/org/chromium/chrome/browser/preferences/BackgroundVideoPlaybackPreference.java

@@ -11,7 +11,7 @@
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveRelaunchUtils;
-import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 
 public class BackgroundVideoPlaybackPreference
  extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
@@ -22,8 +22,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  getActivity().setTitle(R.string.prefs_background_video_playback);
  PreferenceUtils.addPreferencesFromResource(this, R.xml.background_video_playback_preference);
 
- ChromeSwitchPreferenceCompat playbackPref =
- (ChromeSwitchPreferenceCompat) findPreference(BACKGROUND_VIDEO_PLAYBACK_KEY);
+ ChromeSwitchPreference playbackPref =
+ (ChromeSwitchPreference) findPreference(BACKGROUND_VIDEO_PLAYBACK_KEY);
  playbackPref.setChecked(BravePrefServiceBridge.getInstance().getBackgroundVideoPlaybackEnabled());
  playbackPref.setOnPreferenceChangeListener(this);
  }

android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java

@@ -114,8 +114,8 @@ private void removePreferenceIfPresent(String key) {
 
  private void updateSearchEnginePreference() {
  if (!TemplateUrlServiceFactory.get().isLoaded()) {
- ChromeBasePreferenceCompat searchEnginePref =
- (ChromeBasePreferenceCompat) findPreference(PREF_SEARCH_ENGINE_SECTION);
+ ChromeBasePreference searchEnginePref =
+ (ChromeBasePreference) findPreference(PREF_SEARCH_ENGINE_SECTION);
  searchEnginePref.setEnabled(false);
  return;
  }

android/java/org/chromium/chrome/browser/preferences/ClosingAllTabsClosesBravePreference.java

@@ -10,7 +10,7 @@
 import android.support.v7.preference.PreferenceFragmentCompat;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;
 
 public class ClosingAllTabsClosesBravePreference
@@ -26,8 +26,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  getActivity().setTitle(R.string.prefs_closing_all_tabs_closes_brave);
  PreferenceUtils.addPreferencesFromResource(this, R.xml.closing_all_tabs_closes_brave_preference);
 
- ChromeSwitchPreferenceCompat pref =
- (ChromeSwitchPreferenceCompat) findPreference(CLOSING_ALL_TABS_CLOSES_BRAVE_KEY);
+ ChromeSwitchPreference pref =
+ (ChromeSwitchPreference) findPreference(CLOSING_ALL_TABS_CLOSES_BRAVE_KEY);
  pref.setChecked(CloseBraveManager.getClosingAllTabsClosesBraveEnabled());
  pref.setOnPreferenceChangeListener(this);
  }

android/java/org/chromium/chrome/browser/preferences/privacy/BravePrivacyPreferences.java

@@ -13,7 +13,7 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;
 
@@ -29,20 +29,20 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
  super.onCreatePreferences(savedInstanceState, rootKey);
 
- ChromeBaseCheckBoxPreferenceCompat httpsePref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_HTTPSE);
+ ChromeBaseCheckBoxPreference httpsePref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_HTTPSE);
  httpsePref.setOnPreferenceChangeListener(this);
 
- ChromeBaseCheckBoxPreferenceCompat adBlockPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_AD_BLOCK);
+ ChromeBaseCheckBoxPreference adBlockPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_AD_BLOCK);
  adBlockPref.setOnPreferenceChangeListener(this);
 
- ChromeBaseCheckBoxPreferenceCompat fingerprintingProtectionPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_FINGERPRINTING_PROTECTION);
+ ChromeBaseCheckBoxPreference fingerprintingProtectionPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_FINGERPRINTING_PROTECTION);
  fingerprintingProtectionPref.setOnPreferenceChangeListener(this);
 
- ChromeBaseCheckBoxPreferenceCompat closeTabsOnExitPref =
- (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+ ChromeBaseCheckBoxPreference closeTabsOnExitPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
  closeTabsOnExitPref.setOnPreferenceChangeListener(this);
  }
 

android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java

@@ -6,7 +6,6 @@
 package org.chromium.chrome.browser.preferences.website;
 
 import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JCaller;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.Log;
@@ -108,7 +107,7 @@ private void blockedEvent(int tabId, String block_type, String subresource) {
 
  @NativeMethods
  interface Natives {
- void init(@JCaller BraveShieldsContentSettings self);
+ void init(BraveShieldsContentSettings self);
  void destroy(long nativeBraveShieldsContentSettings);
 
  void setBraveShieldsEnabled(boolean enabled, String url, Profile profile);

android/java/org/chromium/chrome/browser/preferences/website/DesktopModePreferences.java

@@ -11,7 +11,7 @@
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
 
 public class DesktopModePreferences
@@ -23,8 +23,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  getActivity().setTitle(R.string.settings_desktop_mode_title);
  PreferenceUtils.addPreferencesFromResource(this, R.xml.desktop_mode_preferences);
 
- ChromeSwitchPreferenceCompat desktopModePref =
- (ChromeSwitchPreferenceCompat) findPreference(DESKTOP_MODE_KEY);
+ ChromeSwitchPreference desktopModePref =
+ (ChromeSwitchPreference) findPreference(DESKTOP_MODE_KEY);
  desktopModePref.setChecked(BravePrefServiceBridge.getInstance().getDesktopModeEnabled());
  desktopModePref.setOnPreferenceChangeListener(this);
  }

android/java/org/chromium/chrome/browser/preferences/website/PlayYTVideoInBrowserPreferences.java

@@ -13,7 +13,7 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
-import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
 
 public class PlayYTVideoInBrowserPreferences
@@ -25,8 +25,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
  getActivity().setTitle(R.string.settings_play_yt_video_in_browser_title);
  PreferenceUtils.addPreferencesFromResource(this, R.xml.play_yt_video_in_browser_preferences);
 
- ChromeSwitchPreferenceCompat pref =
- (ChromeSwitchPreferenceCompat) findPreference(PLAY_YT_VIDEO_IN_BROWSER_KEY);
+ ChromeSwitchPreference pref =
+ (ChromeSwitchPreference) findPreference(PLAY_YT_VIDEO_IN_BROWSER_KEY);
  // Initially enabled.
  pref.setChecked(
  BravePrefServiceBridge.getInstance().getPlayYTVideoInBrowserEnabled());

android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java

@@ -10,11 +10,13 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.components.signin.AccountTrackerService;
+import org.chromium.components.sync.AndroidSyncSettings;
 
 public class BraveSigninManager extends SigninManager {
- BraveSigninManager(Context context, long nativeSigninManagerAndroid, SigninManagerDelegate delegate,
+ BraveSigninManager(Context context, long nativeSigninManagerAndroid,
  AccountTrackerService accountTrackerService) {
- super(context, nativeSigninManagerAndroid, delegate, accountTrackerService);
+ super(context, nativeSigninManagerAndroid, accountTrackerService,
+ AndroidSyncSettings.get());
  }
 
  @Override
@@ -28,12 +30,11 @@ public boolean isSigninSupported() {
  }
 
  @CalledByNative
- private static SigninManager create(long nativeSigninManagerAndroid,
- SigninManagerDelegate delegate, AccountTrackerService accountTrackerService) {
+ private static SigninManager create(
+ long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
  assert nativeSigninManagerAndroid != 0;
- assert delegate != null;
  assert accountTrackerService != null;
- return new BraveSigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
- delegate, accountTrackerService);
+ return new BraveSigninManager(ContextUtils.getApplicationContext(),
+ nativeSigninManagerAndroid, accountTrackerService);
  }
 }

app/app_management_strings.grdp

@@ -70,7 +70,7 @@
  <message name="IDS_APP_MANAGEMENT_SIZE" desc="Label for the size of an app in the app settings page.">
  Size: <ph name="APP_SIZE">$1<ex>8.0MB</ex></ph>
  </message>
- <message name="IDS_APP_MANAGEMENT_UNINSTALL" desc="Label for the uninstall button in the app settings page.">
+ <message name="IDS_APP_MANAGEMENT_UNINSTALL_APP" desc="Label for the uninstall button in the app settings page.">
  Uninstall
  </message>
  <message name="IDS_APP_MANAGEMENT_VERSION" desc="Label for version of an app in the app settings page.">
@@ -85,4 +85,10 @@
  <message name="IDS_APP_MANAGEMENT_STORAGE" desc="Label for the Android storage permission toggle.">
  Storage
  </message>
+ <message name="IDS_APP_MANAGEMENT_SYSTEM_APP_POLICY_STRING" desc="Tooltip label explaining that an app cannot be uninstalled as it is a part of Brave OS (the operating system).">
+ This app cannot be uninstalled as it is part of Brave OS.
+ </message>
+ <message name="IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING" desc="Tooltip label explaining that an app cannot be uninstalled as it has been installed by an adminstrator.">
+ This app has been installed by your administrator.
+ </message>
 </grit-part>

app/bookmarks_strings.grdp

@@ -359,9 +359,18 @@
  <message name="IDS_BOOKMARK_MANAGER_MENU_ADD_FOLDER" desc="Title of the bookmark toolbar dropdown menu item that adds a new folder.">
  Add new folder
  </message>
+ <message name="IDS_BOOKMARK_MANAGER_MENU_CUT" desc="Title of the bookmark dropdown menu item that cuts one or more bookmarks.">
+ Cut
+ </message>
+ <message name="IDS_BOOKMARK_MANAGER_MENU_COPY" desc="Title of the bookmark dropdown menu item that copies one or more bookmarks.">
+ Copy
+ </message>
  <message name="IDS_BOOKMARK_MANAGER_MENU_COPY_URL" desc="Title of the bookmark dropdown menu item that copies the url of the bookmark.">
  Copy URL
  </message>
+ <message name="IDS_BOOKMARK_MANAGER_MENU_PASTE" desc="Title of the bookmark dropdown menu item that pastes one or more bookmarks.">
+ Paste
+ </message>
  <message name="IDS_BOOKMARK_MANAGER_MENU_EXPORT" desc="Title of the bookmark toolbar dropdown menu item that exports bookmarks.">
  Export bookmarks
  </message>
@@ -404,6 +413,9 @@
  <message name="IDS_BOOKMARK_MANAGER_MORE_ACTIONS_AX_LABEL" desc="Spoken text for the button in the bookmark manager which shows an action menu for a bookmark, with actions like 'Edit' or 'Delete'">
  More actions for <ph name="BOOKMARK_NAME">$1<ex>Bookmark X</ex></ph>
  </message>
+ <message name="IDS_BOOKMARK_MANAGER_MORE_ACTIONS_MULTI_AX_LABEL" desc="Spoken text for the button in the bookmark manager which shows an action menu for multiple selected bookmarks, with actions like 'Cut' or 'Delete'">
+ More actions for selected items
+ </message>
  <message name="IDS_BOOKMARK_MANAGER_OPEN_DIALOG_TITLE" desc="Title of the dialog confirming whether a large number of bookmarks should be opened.">
  Open selected items
  </message>
@@ -445,30 +457,30 @@
  &amp;Bookmarks
  </message>
  <if expr="not use_titlecase">
- <message name="IDS_BOOKMARK_THIS_PAGE" desc="Title of the menu item that bookmarks the current page.">
- Bookmark this page...
+ <message name="IDS_BOOKMARK_THIS_TAB" desc="Title of the menu item that bookmarks the current tab.">
+ Bookmark this tab...
  </message>
  </if>
  <if expr="use_titlecase">
- <message name="IDS_BOOKMARK_THIS_PAGE" desc="In Title Case: Title of the menu item that bookmarks the current page.">
- Bookmark This Page...
+ <message name="IDS_BOOKMARK_THIS_TAB" desc="In Title Case: Title of the menu item that bookmarks the current tab.">
+ Bookmark This Tab...
  </message>
  </if>
  <if expr="not use_titlecase">
- <message name="IDS_BOOKMARK_OPEN_PAGES" desc="Title of the menu item that bookmarks all the pages opened in this window.">
- Bookmark open pages...
+ <message name="IDS_BOOKMARK_ALL_TABS" desc="Title of the menu item that bookmarks all the tabs opened in this window.">
+ Bookmark all tabs...
  </message>
  </if>
  <if expr="use_titlecase">
- <message name="IDS_BOOKMARK_OPEN_PAGES" desc="In Title Case: Title of the menu item that bookmarks all the pages opened in this window.">
- Bookmark Open Pages...
+ <message name="IDS_BOOKMARK_ALL_TABS" desc="In Title Case: Title of the menu item that bookmarks all the tabs opened in this window.">
+ Bookmark All Tabs...
  </message>
  </if>
  <!-- End of Bookmarks Menu (in the Main Menu) strings. -->
 
  <!-- Begin of Bookmark Star button strings. -->
- <message name="IDS_TOOLTIP_STARRED" desc="The tooltip shown when you hover the star button in the right side of the location bar and the current page is bookmarked.">
- Edit bookmark for this page
+ <message name="IDS_TOOLTIP_STARRED" desc="The tooltip shown when you hover the star button in the right side of the location bar and the current tab is bookmarked.">
+ Edit bookmark for this tab
  </message>
  <!-- End of Bookmark Star button strings. -->
 

app/brave_main_delegate.cc

@@ -29,6 +29,7 @@
 #include "components/omnibox/common/omnibox_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/unified_consent/feature.h"
+#include "components/sync/driver/sync_driver_switches.h"
 #include "content/public/common/content_features.h"
 #include "extensions/common/extension_features.h"
 #include "services/network/public/cpp/features.h"
@@ -134,7 +135,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
  command_line.AppendSwitch(switches::kEnableDomDistiller);
 #endif
  command_line.AppendSwitch(switches::kDisableDomainReliability);
- command_line.AppendSwitch(switches::kDisableChromeGoogleURLTrackingClient);
  command_line.AppendSwitch(switches::kNoPings);
 
  // Setting these to default values in Chromium to maintain parity
@@ -145,6 +145,10 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
  command_line.AppendSwitchASCII(switches::kExtensionsInstallVerification,
  "enforce");
 
+ // Brave's sync protocol does not use the sync service url
+ command_line.AppendSwitchASCII(switches::kSyncServiceURL,
+ "https://no-thanks.invalid");
+
  // Enabled features.
  const std::unordered_set<const char*> enabled_features = {
 #if BUILDFLAG(ENABLE_EXTENSIONS)