Turn on partner customizations on all pre-stable channels

crrev.com/c/704398 unified the availability of partner customizations
like bookmarks, homepage, etc. The rule was: they are available if
Chrome is a system package, or is force-enabled by a command line
argument "--allow-partner-customization".

Hiding behind a command line argument reduced the benefit of staged
deployment, and lowered the real world coverage.

Now the rule is: partner customizations are available if Chrome is a
system package, or is on pre-stable channels.

Bug: 617284, 773623
Change-Id: I594c0313781cc9c10ab73d6e0f4d7e837d578d46
Reviewed-on: https://chromium-review.googlesource.com/719472
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509475}

chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java

@@ -81,13 +81,6 @@ public abstract class ChromeSwitches {
      */
     public static final String DISABLE_TAB_MERGING_FOR_TESTING = "disable-tab-merging";
 
-    /**
-     * Force-enable partner customization for testing.
-     * Partner customization includes configurations from PartnerBookmarksProvider and
-     * PartnerBrowserCustomizations.
-     */
-    public static final String ALLOW_PARTNER_CUSTOMIZATION = "allow-partner-customization";
-
     ///////////////////////////////////////////////////////////////////////////////////////////////
     // Native Switches
     ///////////////////////////////////////////////////////////////////////////////////////////////

chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java

@@ -8,11 +8,10 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.ChromeVersionInfo;
 
 import java.util.concurrent.TimeUnit;
 
@@ -45,10 +44,10 @@ public class PartnerBookmarksShim {
         if (skip) {
             Log.i(TAG, "Skip reading partner bookmarks since recent result was empty.");
         }
-        boolean systemOrForced =
+        boolean systemOrPreStable =
                 (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-                || CommandLine.getInstance().hasSwitch(ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION);
-        if (skip || !systemOrForced) {
+                || !ChromeVersionInfo.isStableBuild();
+        if (skip || !systemOrPreStable) {
             reader.onBookmarksRead();
             return;
         }

chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java

@@ -19,6 +19,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
 
@@ -178,11 +179,10 @@ public class PartnerBrowserCustomizations {
             @Override
             protected Void doInBackground(Void... params) {
                 try {
-                    boolean systemOrForced =
+                    boolean systemOrPreStable =
                             (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-                            || CommandLine.getInstance().hasSwitch(
-                                       ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION);
-                    if (!systemOrForced) {
+                            || !ChromeVersionInfo.isStableBuild();
+                    if (!systemOrPreStable) {
                         // Only allow partner customization if this browser is a system package, or
                         // forced for testing purposes.
                         return null;

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java

@@ -146,6 +146,7 @@ public class BookmarkTest {
         // Click star button to bookmark the current tab.
         MenuUtils.invokeCustomMenuActionSync(InstrumentationRegistry.getInstrumentation(),
                 mActivityTestRule.getActivity(), R.id.bookmark_this_page_id);
+        BookmarkTestUtil.waitForBookmarkModelLoaded();
         // All actions with BookmarkModel needs to run on UI thread.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableBookmarksEditingUnitTest.java

@@ -19,9 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider;
 
@@ -29,9 +27,6 @@ import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz
  * Unit tests for the partner disabling bookmarks editing functionality.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({
-        ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION,
-})
 public class PartnerDisableBookmarksEditingUnitTest {
     @Rule
     public BasePartnerBrowserCustomizationUnitTestRule mTestRule =

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

@@ -42,7 +42,6 @@ import java.util.concurrent.ExecutionException;
 @CommandLineFlags.Add({
         ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
         ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
-        ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION,
 })
 public class PartnerDisableIncognitoModeIntegrationTest {
     @Rule

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeUnitTest.java

@@ -19,9 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider;
 
@@ -29,9 +27,6 @@ import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz
  * Unit tests for the partner disabling incognito mode functionality.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({
-        ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION,
-})
 public class PartnerDisableIncognitoModeUnitTest {
     @Rule
     public BasePartnerBrowserCustomizationUnitTestRule mTestRule =

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java

@@ -57,7 +57,6 @@ import java.util.concurrent.TimeoutException;
 @CommandLineFlags.Add({
         ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
         ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
-        ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION,
 })
 public class PartnerHomepageIntegrationTest {
     @Rule

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java

@@ -18,10 +18,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsDelayedProvider;
 import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomizationsProvider;
@@ -30,9 +28,6 @@ import org.chromium.chrome.test.partnercustomizations.TestPartnerBrowserCustomiz
  * Unit test suite for partner homepage.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({
-        ChromeSwitches.ALLOW_PARTNER_CUSTOMIZATION,
-})
 public class PartnerHomepageUnitTest {
     @Rule
     public BasePartnerBrowserCustomizationUnitTestRule mTestRule =