[Reland] [Media Router] Allow users to update cloud services pref when sync is not active.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 788 matching lines @@
 void MediaRouterWebUIMessageHandler::MaybeUpdateFirstRunFlowData() {
   base::DictionaryValue first_run_flow_data;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* pref_service = profile->GetPrefs();
 
   bool first_run_flow_acknowledged =
       pref_service->GetBoolean(prefs::kMediaRouterFirstRunFlowAcknowledged);
   bool show_cloud_pref = false;
 #if defined(GOOGLE_CHROME_BUILD)
-  // Cloud services preference is shown if user is logged in and 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.
-  if (!pref_service->GetBoolean(prefs::kMediaRouterCloudServicesPrefSet) &&
-      profile->IsSyncAllowed()) {
+  // Cloud services preference is shown if user is logged in. 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.
+  if (!pref_service->GetBoolean(prefs::kMediaRouterCloudServicesPrefSet)) {
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile);
-    if (signin_manager && signin_manager->IsAuthenticated() &&
-        ProfileSyncServiceFactory::GetForProfile(profile)->IsSyncActive()) {
+    if (signin_manager && signin_manager->IsAuthenticated()) {
       // If the user had previously acknowledged the first run flow without
       // being shown the cloud services option, and is now logged in with sync
       // enabled, turn on cloud services.
-      if (first_run_flow_acknowledged) {
+      if (first_run_flow_acknowledged &&
+          ProfileSyncServiceFactory::GetForProfile(profile)->IsSyncActive()) {
         pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices, true);
         pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet,
                                  true);
         // Return early since the first run flow won't be surfaced.
         return;
       }
 
       show_cloud_pref = true;
       // "Casting to a Hangout from Chrome" Chromecast help center page.
       first_run_flow_data.SetString("firstRunFlowCloudPrefLearnMoreUrl",
@@ skipping 57 matching lines @@
   }
 
   return value;
 }
 
 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
   set_web_ui(web_ui);
 }
 
 }  // namespace media_router