Enable theme-color on Chrome tabbed mode for phones by default.

chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
index 800506dbe67c11c01f4cb515c43f96ac75f4dc50..755c9dfaf8e21153328a57674df5c1d4459da00c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
@@ -11,13 +11,10 @@ import android.view.View;
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
-import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeApplication;
-import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.media.MediaCaptureNotificationService;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
@@ -25,7 +22,6 @@ import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.policy.PolicyAuditor;
 import org.chromium.chrome.browser.policy.PolicyAuditor.AuditEvent;
 import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.ui.base.DeviceFormFactor;
@@ -228,8 +224,7 @@ public class TabWebContentsObserver extends WebContentsObserver {
             color = mTab.getDefaultThemeColor();
         }
         if (mTab.isShowingInterstitialPage()) color = mTab.getDefaultThemeColor();
-        if (!FeatureUtilities.isDocumentMode(mTab.getApplicationContext())
-                && !isThemeColorEnabledInTabbedMode(mTab.getApplicationContext())) {
+        if (!isThemeColorEnabled(mTab.getApplicationContext())) {
             color = mTab.getDefaultThemeColor();
         }
         if (color == Color.TRANSPARENT) color = mTab.getDefaultThemeColor();
@@ -302,12 +297,7 @@ public class TabWebContentsObserver extends WebContentsObserver {
         return mThemeColor;
     }
 
-    private static boolean isThemeColorEnabledInTabbedMode(Context context) {
-        if (DeviceFormFactor.isTablet(context)) return false;
-        CommandLine commandLine = CommandLine.getInstance();
-        return ChromeVersionInfo.isLocalBuild()
-                || ChromeVersionInfo.isCanaryBuild()
-                || ChromeVersionInfo.isDevBuild()
-                || commandLine.hasSwitch(ChromeSwitches.ENABLE_THEME_COLOR_IN_TABBED_MODE);
+    private static boolean isThemeColorEnabled(Context context) {
+        return !DeviceFormFactor.isTablet(context);
     }
 }