Upgrade from Chromium 79.0.3945.130 to Chromium 80.0.3987.78 (1.4.x)

BUILD.gn

@@ -332,7 +332,6 @@ if (!is_android && !is_ios) {
       ]
 
       if (v8_use_external_startup_data) {
-        sources += [ "$root_out_dir/natives_blob.bin" ]
         deps += [ "//v8" ]
 
         if (use_v8_context_snapshot) {

DEPS

@@ -10,7 +10,7 @@ deps = {
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/brave/python-patch@d8880110be6554686bc08261766538c2926d4e82",
   "vendor/omaha":  "https://github.com/brave/omaha.git@de118d8511e4754a673d44a9f1e92d80442069e7",
-  "vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0",
+  "vendor/sparkle": "https://github.com/brave/Sparkle.git@577eee9cbf955b4dd39746b4f03a1944fcd323fd",
   "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",

android/brave_java_sources.gni

@@ -13,17 +13,18 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveBadge.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveFeatureList.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java",
-  "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuObserver.java",
   "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java",
+  "../../brave/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java",
@@ -45,35 +46,35 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/AppearancePreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BackgroundVideoPlaybackPreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceFragment.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceManager.java",
+  "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceKeys.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrivateSearchEnginePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveRewardsPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveRewardsResetPreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveRewardsResetPreferenceDialog.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSearchEngineAdapter.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSearchEnginePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSearchEngineUtils.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveStandardSearchEnginePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensPreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/ClosingAllTabsClosesBravePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/SearchEngineTabModelSelectorObserver.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/privacy/BravePrivacyPreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/themes/BraveRadioButtonGroupThemePreference.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/themes/BraveThemePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveSiteSettingsPreferencesBase.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/website/DesktopModePreferences.java",
-  "../../brave/android/java/org/chromium/chrome/browser/preferences/website/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
   "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BravePrivateSearchEnginePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineUtils.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveStandardSearchEnginePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java",  
+  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java",
+  "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/invalidation/BraveBrowserSyncAdapterService.java",
   "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncService.java",

android/java/org/chromium/chrome/browser/BraveActivity.java

@@ -31,10 +31,11 @@
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.onboarding.OnboardingActivity;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
-import org.chromium.chrome.browser.preferences.BraveSearchEngineUtils;
+import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tabmodel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;

android/java/org/chromium/chrome/browser/BraveRewardsHelper.java

@@ -34,6 +34,7 @@
 import org.chromium.chrome.browser.favicon.IconType;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tabmodel.TabModelImpl;
 import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
 import org.chromium.chrome.R;
@@ -74,7 +75,7 @@ public interface LargeIconReadyCallback {
 
     public BraveRewardsHelper () {
         if (mLargeIconBridge == null) {
-            mLargeIconBridge = new LargeIconBridge(currentActiveTab().getProfile());
+            mLargeIconBridge = new LargeIconBridge(((TabImpl)currentActiveTab()).getProfile());
         }
     }
 

android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java

@@ -21,6 +21,7 @@
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
+import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
 
 public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegateImpl {
     private Menu mMenu;
@@ -36,8 +37,8 @@ public BraveAppMenuPropertiesDelegateImpl(Context context,
     }
 
     @Override
-    public void prepareMenu(Menu menu) {
-        super.prepareMenu(menu);
+    public void prepareMenu(Menu menu, AppMenuHandler handler) {
+        super.prepareMenu(menu, handler);
 
         mMenu = menu;
 

android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java

@@ -42,6 +42,7 @@
 //import org.chromium.chrome.browser.MixPanelWorker;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
+import org.chromium.ui.widget.ChromeImageView;
 
 import java.util.List;
 import java.lang.NumberFormatException;
@@ -265,7 +266,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                         number.setTag(R.string.brave_shields_scripts_blocked);
                     }
                 } else if (6 == position) {
-                    convertView = mInflater.inflate(R.layout.brave_shields_menu_item, parent, false);
+//                    convertView = mInflater.inflate(R.layout.brave_shields_menu_item, parent, false);
                     TextView text = (TextView) convertView.findViewById(R.id.brave_shields_text);
                     if (text != null) {
                         text.setText(R.string.brave_shields_fingerprint_methods);
@@ -311,13 +312,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
                         text.setText(value);
                     }*/
                 } else {
-                    convertView = mInflater.inflate(R.layout.menu_item, parent, false);
+//                    convertView = mInflater.inflate(R.layout.menu_item, parent, false);
                     holder.text = (TextView) convertView.findViewById(R.id.menu_item_text);
-                    holder.image = (AppMenuItemIcon) convertView.findViewById(R.id.menu_item_icon);
+                    //holder.image = (AppMenuItemIcon) convertView.findViewById(R.id.menu_item_icon);
                     convertView.setTag(holder);
                 }
-                convertView.setTag(R.id.menu_item_enter_anim_id,
-                        buildStandardItemEnterAnimator(convertView, position));
+//                convertView.setTag(R.id.menu_item_enter_anim_id,
+//                        buildStandardItemEnterAnimator(convertView, position));
 
                 mPositionViews.append(position, convertView);
             } else {
@@ -631,7 +632,7 @@ private void setupStandardMenuItemViewHolder(StandardMenuItemViewHolder holder,
         Drawable icon = item.getIcon();
         holder.image.setImageDrawable(icon);
         holder.image.setVisibility(icon == null ? View.GONE : View.VISIBLE);
-        holder.image.setChecked(item.isChecked());
+//        holder.image.setChecked(item.isChecked());
         holder.text.setText(item.getTitle());
         holder.text.setContentDescription(item.getTitleCondensed());
 
@@ -725,7 +726,7 @@ public void onAnimationStart(Animator animation) {
 
     static class StandardMenuItemViewHolder {
         public TextView text;
-        public AppMenuItemIcon image;
+        public /*AppMenuItemIcon*/ChromeImageView image;
     }
 
     static class CustomMenuItemViewHolder extends StandardMenuItemViewHolder {

android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java

@@ -265,7 +265,7 @@ private void runMenuItemEnterAnimations() {
         ViewGroup list = mPopup.getListView();
         for (int i = 0; i < list.getChildCount(); i++) {
             View view = list.getChildAt(i);
-            Object animatorObject = view.getTag(R.id.menu_item_enter_anim_id);
+            Object animatorObject = null;/* = view.getTag(R.id.menu_item_enter_anim_id);*/
             if (animatorObject != null) {
                 if (builder == null) {
                     builder = mMenuItemEnterAnimator.play((Animator) animatorObject);

android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java

@@ -12,7 +12,7 @@
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
-import org.chromium.chrome.browser.util.FeatureUtilities;
+import org.chromium.chrome.browser.flags.FeatureUtilities;
 
 /**
  * Base class for ChromeLauncherActivity

android/java/org/chromium/chrome/browser/preferences/BravePreferenceManager.java → android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.chromium.chrome.browser.preferences;
+package org.chromium.chrome.browser.flags;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -14,32 +14,34 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
-public class BravePreferenceManager {
-    public static final String BRAVE_BOTTOM_TOOLBAR_SET_KEY = "brave_bottom_toolbar_set";
-    public static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY = "brave_bottom_toolbar_enabled";
-
+public class BraveFeatureUtilities {
     private static final int SMALL_SCREEN_WIDTH = 360;
     private static final int SMALL_SCREEN_HEIGHT = 640;
 
-    public boolean isBottomToolbarEnabled() {
+    public static boolean isBottomToolbarEnabled() {
         SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
-        if (sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_SET_KEY, false)) {
-            return sharedPreferences.getBoolean(BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, true);
+        if (sharedPreferences.getBoolean(
+                    BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_SET_KEY, false)) {
+            return sharedPreferences.getBoolean(
+                    BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, true);
         } else {
-            ChromePreferenceManager.getInstance().writeBoolean(BRAVE_BOTTOM_TOOLBAR_SET_KEY, true);
+            SharedPreferencesManager.getInstance().writeBoolean(
+                    BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_SET_KEY, true);
             boolean enable = true;
             if (isSmallScreen()) {
                 enable = false;
             }
-            ChromePreferenceManager.getInstance().writeBoolean(
-                    BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, enable);
+            SharedPreferencesManager.getInstance().writeBoolean(
+                    BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, enable);
 
             return enable;
         }
     }
 
-    private boolean isSmallScreen() {
+    private static boolean isSmallScreen() {
         Activity currentActivity = null;
         for (Activity ref : ApplicationStatus.getRunningActivities()) {
             currentActivity = ref;

android/java/org/chromium/chrome/browser/ntp/BraveDuckDuckGoOfferView.java

@@ -14,7 +14,7 @@
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.preferences.BraveSearchEngineUtils;
+import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.components.search_engines.TemplateUrl;
 

android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java

@@ -23,7 +23,7 @@
 import org.chromium.chrome.browser.onboarding.OnViewPagerAction;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
 import org.chromium.chrome.browser.onboarding.SearchEngineEnum;
-import org.chromium.chrome.browser.preferences.BraveSearchEngineUtils;
+import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.search_engines.TemplateUrlService;

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

@@ -0,0 +1,11 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ package org.chromium.chrome.browser.preferences;
+
+ public final class BravePreferenceKeys {
+    public static final String BRAVE_BOTTOM_TOOLBAR_SET_KEY = "brave_bottom_toolbar_set";
+    public static final String BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY = "brave_bottom_toolbar_enabled";
+ }

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

@@ -12,7 +12,7 @@
 import org.chromium.chrome.browser.ContentSettingsType;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettingsObserver;
-import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
+import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
 
 import java.util.List;