Merge pull request #4713 from brave/pr4697_android_block_chromium_par…

…tner_customizations_1.6.x

Disabled Chromium partners customizations (uplift to 1.6.x)

android/brave_java_sources.gni

@@ -53,6 +53,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/onboarding/SearchEngineEnum.java",
   "../../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/BravePartnerBrowserCustomizations.java",
   "../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceKeys.java",
   "../../brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",

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

@@ -7,10 +7,23 @@
 
 import org.chromium.chrome.browser.help.BraveHelpAndFeedback;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
+import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
+import org.chromium.chrome.browser.partnercustomizations.BravePartnerBrowserCustomizations;
+import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 
 public class BraveAppHooks extends AppHooksImpl {
     @Override
     public HelpAndFeedback createHelpAndFeedback() {
         return new BraveHelpAndFeedback();
     }
+
+    @Override
+    public PartnerBookmark.BookmarkIterator getPartnerBookmarkIterator() {
+        return null;
+    }
+
+    @Override
+    public PartnerBrowserCustomizations.Provider getCustomizationProvider() {
+        return new BravePartnerBrowserCustomizations.ProviderPackage();
+    }
 }

android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java

@@ -0,0 +1,26 @@
+/* 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.partnercustomizations;
+
+public class BravePartnerBrowserCustomizations
+        extends PartnerBrowserCustomizations {
+    public static class ProviderPackage implements Provider {
+        @Override
+        public String getHomepage() {
+            return null;
+        }
+
+        @Override
+        public boolean isIncognitoModeDisabled() {
+            return false;
+        }
+
+        @Override
+        public boolean isBookmarksEditingDisabled() {
+            return false;
+        }
+    }
+}