Experimental flag to enable Google Cloud Devices features.

BUG=374349

Review URL: https://codereview.chromium.org/292593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271255 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 21 insertions, 3 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 92cfd10..88daa15 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13930,6 +13930,12 @@ Do you accept?
 
     <!-- Local Device Discovery display strings -->
     <if expr="enable_service_discovery">
+      <message name="IDS_FLAGS_ENABLE_CLOUD_DEVICES_NAME" desc="Name of the 'Enable Cloud Devices' lab.">
+        Enable Google Cloud Devices
+      </message>
+      <message name="IDS_FLAGS_ENABLE_CLOUD_DEVICES_DESCRIPTION" desc="Description of the 'Enable Cloud Devices' lab.">
+        Enabled Google Cloud Devices features.
+      </message>
       <message name="IDS_LOCAL_DISCOVERY_SERVICE_REGISTER" desc="Name for button to register device in the Cloud">
         Register
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 2fc963a..4515540 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -22,6 +22,7 @@
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/autofill/core/common/autofill_switches.h"
+#include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/common/switches.h"
@@ -1337,22 +1338,29 @@ const Experiment kExperiments[] = {
     "disable-device-discovery",
     IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_NAME,
     IDS_FLAGS_DISABLE_DEVICE_DISCOVERY_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
+    kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kDisableDeviceDiscovery)
   },
   {
     "device-discovery-notifications",
     IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_NAME,
     IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
+    kOsDesktop,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications,
                               switches::kDisableDeviceDiscoveryNotifications)
   },
   {
+    "enable-cloud-devices",
+    IDS_FLAGS_ENABLE_CLOUD_DEVICES_NAME,
+    IDS_FLAGS_ENABLE_CLOUD_DEVICES_DESCRIPTION,
+    kOsDesktop,
+    SINGLE_VALUE_TYPE(switches::kEnableCloudDevices)
+  },
+  {
     "enable-print-preview-register-promos",
     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
+    kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)
   },
 #endif  // ENABLE_SERVICE_DISCOVERY
diff --git a/components/cloud_devices/common/cloud_devices_switches.cc b/components/cloud_devices/common/cloud_devices_switches.cc
index 83667fa..a65f910 100644
--- a/components/cloud_devices/common/cloud_devices_switches.cc
+++ b/components/cloud_devices/common/cloud_devices_switches.cc
@@ -6,6 +6,9 @@
 
 namespace switches {
 
+// Enable Google Cloud Devices code.
+const char kEnableCloudDevices[] = "enable-cloud-devices";
+
 // The URL of the cloud print service to use, overrides any value stored in
 // preferences, and the default. Only used if the cloud print service has been
 // enabled. Used for testing.
diff --git a/components/cloud_devices/common/cloud_devices_switches.h b/components/cloud_devices/common/cloud_devices_switches.h
index 2a57d73..343cf66 100644
--- a/components/cloud_devices/common/cloud_devices_switches.h
+++ b/components/cloud_devices/common/cloud_devices_switches.h
@@ -7,6 +7,7 @@
 
 namespace switches {
 
+extern const char kEnableCloudDevices[];
 extern const char kCloudPrintURL[];
 extern const char kCloudPrintXmppEndpoint[];
 extern const char kCloudDevicesURL[];