Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / about_flags.cc

diff --git a/src/chrome/browser/about_flags.cc b/src/chrome/browser/about_flags.cc
index e9d22fe..6004fab 100644 (file)
--- a/src/chrome/browser/about_flags.cc
+++ b/src/chrome/browser/about_flags.cc
@@ -926,11 +926,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)
   },
   {
-    "enable-easy-signin",
-    IDS_FLAGS_ENABLE_EASY_SIGNIN_NAME,
-    IDS_FLAGS_ENABLE_EASY_SIGNIN_DESCRIPTION,
+    "disable-easy-signin",
+    IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME,
+    IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION,
     kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(chromeos::switches::kEnableEasySignin),
+    SINGLE_VALUE_TYPE(chromeos::switches::kDisableEasySignin),
   },
 #endif
 #if defined(USE_ASH)
@@ -1471,13 +1471,6 @@ const Experiment kExperiments[] = {
     kOsLinux | kOsWin | kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
   },
-  {
-    "disable-drive-apps-in-app-list",
-    IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME,
-    IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
-    kOsCrOS,
-    SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList)
-  },
 #endif
 #if defined(OS_ANDROID)
   {
@@ -1845,6 +1838,14 @@ const Experiment kExperiments[] = {
         data_reduction_proxy::switches::kEnableDataReductionProxyDev,
         data_reduction_proxy::switches::kDisableDataReductionProxyDev)
   },
+  {
+    "enable-data-reduction-proxy-alt",
+    IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
+    IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
+    kOsAndroid,
+    SINGLE_VALUE_TYPE(
+        data_reduction_proxy::switches::kEnableDataReductionProxyAlt)
+  },
 #endif
   {
     "enable-experimental-hotwording",
@@ -1918,14 +1919,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnPackets)
   },
 #endif  // OS_CHROMEOS
-  {
-    "enable-data-reduction-proxy-alt",
-    IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
-    IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
-    kOsAndroid,
-    SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
-                          kEnableDataReductionProxyAlt)
-  },
 #if defined(USE_AURA)
   {
     "enable-tab-audio-muting",
@@ -2064,6 +2057,11 @@ bool SkipConditionalExperiment(const Experiment& experiment,
       chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
     return true;
   }
+  // enable-data-reduction-proxy-alt is only available for the Dev channel.
+  if (!strcmp("enable-data-reduction-proxy-alt", experiment.internal_name) &&
+      chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
+    return true;
+  }
 #endif
 
   return false;