[Media Router] Add cloud services preferences.

Part 6.

This change adds two syncable preferences related to using cloud services with Media Router.

kMediaRouterCloudServicesPrefSet tracks whether or not the user has explicitly acknowledged the first run flow with the cloud services preference present. This is important to keep track of since there are users who have acknowledged the first run flow before the work related to the cloud services lands (currently in progress). This will be used to surface a different prompt to ask if users want to enable cloud services.

kMediaRouterEnableCloudServices tracks whether the user has enabled cloud services.

BUG=560457

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

Cr-Commit-Position: refs/heads/master@{#371456}

chrome/browser/profiles/profile.cc

@@ -152,6 +152,16 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
+#if defined(GOOGLE_CHROME_BUILD)
+  registry->RegisterBooleanPref(
+      prefs::kMediaRouterCloudServicesPrefSet,
+      false,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kMediaRouterEnableCloudServices,
+      false,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+#endif  // defined(GOOGLE_CHROME_BUILD)
   registry->RegisterBooleanPref(
       prefs::kMediaRouterFirstRunFlowAcknowledged,
       false,

chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

@@ -406,8 +406,14 @@ Polymer({
    * @private
    */
   acknowledgeFirstRunFlow_: function() {
+    var userOptedIntoCloudServices = this.$$('#first-run-cloud-checkbox') ?
+      this.$$('#first-run-cloud-checkbox').checked : false;
+    this.fire('acknowledge-first-run-flow', {
+      optedIntoCloudServices: userOptedIntoCloudServices,
+    });
+
     this.showFirstRunFlow = false;
-    this.fire('acknowledge-first-run-flow');
+    this.showFirstRunFlowCloudPref = false;
   },
 
   /**

chrome/browser/resources/media_router/media_router.js

@@ -81,9 +81,17 @@ cr.define('media_router', function() {
    * Updates the preference that the user has seen the first run flow.
    * Called when the user clicks on the acknowledgement button on the first run
    * flow.
+   *
+   * @param {!Event} event
+   * Parameters in |event|.detail:
+   *   optedIntoCloudServices - whether or not the user opted into cloud
+   *                            services.
    */
-  function onAcknowledgeFirstRunFlow() {
-    media_router.browserApi.acknowledgeFirstRunFlow();
+  function onAcknowledgeFirstRunFlow(event) {
+    /** @type {{optedIntoCloudServices: boolean}} */
+    var detail = event.detail;
+    media_router.browserApi.acknowledgeFirstRunFlow(
+        detail.optedIntoCloudServices);
   }
 
   /**

chrome/browser/resources/media_router/media_router_ui_interface.js

@@ -55,7 +55,8 @@ cr.define('media_router.ui', function() {
    *          sinks: !Array<!media_router.Sink>,
    *          routes: !Array<!media_router.Route>,
    *          castModes: !Array<!media_router.CastMode>,
-   *          wasFirstRunFlowAcknowledged: boolean}} data
+   *          wasFirstRunFlowAcknowledged: boolean,
+   *          showFirstRunFlowCloudPref: boolean}} data
    * Parameters in data:
    *   firstRunFlowCloudPrefLearnMoreUrl - url to open when the cloud services
    *       pref learn more link is clicked.
@@ -65,6 +66,8 @@ cr.define('media_router.ui', function() {
    *   castModes - list of available cast modes.
    *   wasFirstRunFlowAcknowledged - true if first run flow was previously
    *       acknowledged by user.
+   *   showFirstRunFlowCloudPref - true if the cloud pref option should be
+   *       shown.
    */
   function setInitialData(data) {
     container.firstRunFlowCloudPrefLearnMoreUrl =
@@ -74,6 +77,8 @@ cr.define('media_router.ui', function() {
     container.allSinks = data['sinks'];
     container.routeList = data['routes'];
     container.showFirstRunFlow = !data['wasFirstRunFlowAcknowledged'];
+    container.showFirstRunFlowCloudPref =
+        data['showFirstRunFlowCloudPref'];
     container.maybeShowRouteDetailsOnOpen();
     media_router.browserApi.onInitialDataReceived();
   }
@@ -134,9 +139,12 @@ cr.define('media_router.browserApi', function() {
 
   /**
    * Indicates that the user has acknowledged the first run flow.
+   *
+   * @param {boolean} optedIntoCloudServices Whether or not the user opted into
+   *                  cloud services.
    */
-  function acknowledgeFirstRunFlow() {
-    chrome.send('acknowledgeFirstRunFlow');
+  function acknowledgeFirstRunFlow(optedIntoCloudServices) {
+    chrome.send('acknowledgeFirstRunFlow', [optedIntoCloudServices]);
   }
 
   /**

chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

@@ -348,11 +348,24 @@ void MediaRouterWebUIMessageHandler::OnRequestInitialData(
                        media_router_ui_->GetPresentationRequestSourceName()));
   initial_data.Set("castModes", cast_modes_list.release());
 
+  Profile* profile = Profile::FromWebUI(web_ui());
+
   bool first_run_flow_acknowledged =
-      Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
+      profile->GetPrefs()->GetBoolean(
           prefs::kMediaRouterFirstRunFlowAcknowledged);
   initial_data.SetBoolean("wasFirstRunFlowAcknowledged",
                           first_run_flow_acknowledged);
+  bool show_cloud_pref = false;
+#if defined(GOOGLE_CHROME_BUILD)
+  // Cloud services preference is shown if user has sync enabled.
+  // If the user enables sync after acknowledging the first run flow, this is
+  // treated as the user opting into Google services, including cloud services,
+  // if the browser is a Chrome branded build.
+  show_cloud_pref = profile->IsSyncAllowed() &&
+      !profile->GetPrefs()->GetBoolean(
+          prefs::kMediaRouterCloudServicesPrefSet);
+#endif  // defined(GOOGLE_CHROME_BUILD)
+  initial_data.SetBoolean("showFirstRunFlowCloudPref", show_cloud_pref);
 
   web_ui()->CallJavascriptFunction(kSetInitialData, initial_data);
   media_router_ui_->UIInitialized();
@@ -414,6 +427,19 @@ void MediaRouterWebUIMessageHandler::OnAcknowledgeFirstRunFlow(
   DVLOG(1) << "OnAcknowledgeFirstRunFlow";
   Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
       prefs::kMediaRouterFirstRunFlowAcknowledged, true);
+
+#if defined(GOOGLE_CHROME_BUILD)
+  bool enabled_cloud_services = false;
+  if (!args->GetBoolean(0, &enabled_cloud_services)) {
+    DVLOG(1) << "Unable to extract args.";
+    return;
+  }
+
+  Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
+      prefs::kMediaRouterEnableCloudServices, enabled_cloud_services);
+  Profile::FromWebUI(web_ui())->GetPrefs()->SetBoolean(
+      prefs::kMediaRouterCloudServicesPrefSet, true);
+#endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 void MediaRouterWebUIMessageHandler::OnActOnIssue(

chrome/common/pref_names.cc

@@ -2162,6 +2162,15 @@ const char kClickedUpdateMenuItem[] = "omaha.clicked_update_menu_item";
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
+#if defined(GOOGLE_CHROME_BUILD)
+// Whether or not the user has explicitly set the cloud services preference
+// through the first run flow.
+const char kMediaRouterCloudServicesPrefSet[] =
+    "media_router.cloudservices.prefset";
+// Whether or not the user has enabled cloud services with Media Router.
+const char kMediaRouterEnableCloudServices[] =
+    "media_router.cloudservices.enabled";
+#endif  // defined(GOOGLE_CHROME_BUILD)
 // Whether or not the Media Router first run flow has been acknowledged by the
 // user.
 const char kMediaRouterFirstRunFlowAcknowledged[] =

chrome/common/pref_names.h

@@ -796,6 +796,10 @@ extern const char kClickedUpdateMenuItem[];
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
+#if defined(GOOGLE_CHROME_BUILD)
+extern const char kMediaRouterCloudServicesPrefSet[];
+extern const char kMediaRouterEnableCloudServices[];
+#endif  // defined(GOOGLE_CHROME_BUILD)
 extern const char kMediaRouterFirstRunFlowAcknowledged[];
 #endif
 

chrome/test/data/webui/media_router/media_router_container_tests.js

@@ -173,7 +173,9 @@ cr.define('media_router_container', function() {
         container.showFirstRunFlow = true;
 
         setTimeout(function() {
-          container.addEventListener('acknowledge-first-run-flow', function() {
+          container.addEventListener('acknowledge-first-run-flow',
+              function(data) {
+            assertFalse(data.detail.optedIntoCloudServices);
             done();
           });
           MockInteractions.tap(container.shadowRoot.getElementById(
@@ -181,6 +183,45 @@ cr.define('media_router_container', function() {
         });
       });
 
+      // Tests for 'acknowledge-first-run-flow' event firing when the
+      // 'first-run-button' button is clicked and the cloud preference checkbox
+      // is also shown.
+      test('first run button with cloud pref click', function(done) {
+        container.showFirstRunFlow = true;
+        container.showFirstRunFlowCloudPref = true;
+
+        setTimeout(function() {
+          container.addEventListener('acknowledge-first-run-flow',
+              function(data) {
+            assertTrue(data.detail.optedIntoCloudServices);
+            done();
+          });
+          MockInteractions.tap(container.shadowRoot.getElementById(
+              'first-run-button'));
+        });
+      });
+
+      // Tests for 'acknowledge-first-run-flow' event firing when the
+      // 'first-run-button' button is clicked after the cloud preference
+      // checkbox is deselected.
+      test('first run button with cloud pref deselected click',
+          function(done) {
+        container.showFirstRunFlow = true;
+        container.showFirstRunFlowCloudPref = true;
+
+        setTimeout(function() {
+          container.addEventListener('acknowledge-first-run-flow',
+              function(data) {
+            assertFalse(data.detail.optedIntoCloudServices);
+            done();
+          });
+          MockInteractions.tap(container.shadowRoot.getElementById(
+              'first-run-cloud-checkbox'));
+          MockInteractions.tap(container.shadowRoot.getElementById(
+              'first-run-button'));
+        });
+      });
+
       // Tests for 'create-route' event firing when a sink with no associated
       // route is clicked.
       test('select sink without a route', function(done) {