[Dark] Add flag enabled by default for Q+

Bug: 958997
Change-Id: I5508e191ac7767a8f1266e66157d59e08047c5e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612277Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659733}

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

@@ -161,6 +161,7 @@ public abstract class ChromeFeatureList {
     public static final String ADJUST_WEBAPK_INSTALLATION_SPACE = "AdjustWebApkInstallationSpace";
     public static final String ANDROID_NIGHT_MODE = "AndroidNightMode";
     public static final String ANDROID_NIGHT_MODE_CCT = "AndroidNightModeCCT";
+    public static final String ANDROID_NIGHT_MODE_FOR_Q = "AndroidNightModeForQ";
     public static final String ANDROID_PAY_INTEGRATION_V1 = "AndroidPayIntegrationV1";
     public static final String ANDROID_PAY_INTEGRATION_V2 = "AndroidPayIntegrationV2";
     public static final String ANDROID_PAYMENT_APPS = "AndroidPaymentApps";

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -16,6 +16,7 @@ import android.os.UserManager;
 import android.speech.RecognizerIntent;
 import android.support.annotation.Nullable;
 
+import org.chromium.base.BuildInfo;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.SysUtils;
@@ -517,9 +518,11 @@ public class FeatureUtilities {
      * next startup, the value can be made available immediately.
      */
     public static void cacheNightModeAvailable() {
+        boolean available = ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_NIGHT_MODE)
+                || (BuildInfo.isAtLeastQ()
+                        && ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_NIGHT_MODE_FOR_Q));
         ChromePreferenceManager.getInstance().writeBoolean(
-                ChromePreferenceManager.NIGHT_MODE_AVAILABLE_KEY,
-                ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_NIGHT_MODE));
+                ChromePreferenceManager.NIGHT_MODE_AVAILABLE_KEY, available);
     }
 
     /**

chrome/browser/android/chrome_feature_list.cc

@@ -87,6 +87,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kAllowRemoteContextForNotifications,
     &kAndroidNightMode,
     &kAndroidNightModeCCT,
+    &kAndroidNightModeForQ,
     &kAndroidPayIntegrationV1,
     &kAndroidPayIntegrationV2,
     &kAndroidPaymentApps,
@@ -234,6 +235,9 @@ const base::Feature kAndroidNightMode{"AndroidNightMode",
 const base::Feature kAndroidNightModeCCT{"AndroidNightModeCCT",
                                          base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kAndroidNightModeForQ{"AndroidNightModeForQ",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
+
 // TODO(rouslan): Remove this.
 const base::Feature kAndroidPayIntegrationV1{"AndroidPayIntegrationV1",
                                              base::FEATURE_ENABLED_BY_DEFAULT};

chrome/browser/android/chrome_feature_list.h

@@ -17,6 +17,7 @@ extern const base::Feature kAllowNewIncognitoTabIntents;
 extern const base::Feature kAllowRemoteContextForNotifications;
 extern const base::Feature kAndroidNightMode;
 extern const base::Feature kAndroidNightModeCCT;
+extern const base::Feature kAndroidNightModeForQ;
 extern const base::Feature kAndroidPayIntegrationV1;
 extern const base::Feature kAndroidPayIntegrationV2;
 extern const base::Feature kAndroidPaymentApps;