Merge 253787 "[GCM] Make sure GCM checkout logic is invoked when..."

chrome/browser/sync/profile_sync_service_factory.cc

 // Copyright (c) 2012 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/sync/profile_sync_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 77 matching lines @@
 BrowserContextKeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
 
   ProfileSyncService::StartBehavior behavior =
       browser_defaults::kSyncAutoStarts ? ProfileSyncService::AUTO_START
                                         : ProfileSyncService::MANUAL_START;
 
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
 
-  // Automatically load the GCMProfileService if the enabled state has been
-  // explicitly set.
-  const base::Value* gcm_enabled_value =
-      profile->GetPrefs()->GetUserPrefValue(prefs::kGCMChannelEnabled);
-  bool gcm_enabled = false;
-  if (gcm_enabled_value &&
-      gcm_enabled_value->GetAsBoolean(&gcm_enabled) &&
-      gcm_enabled) {
-    gcm::GCMProfileServiceFactory::GetForProfile(profile);
-  }
+  // Always create the GCMProfileService instance such that we can listen to
+  // the profile notifications and purge the GCM store when the profile is
+  // being signed out.
+  gcm::GCMProfileServiceFactory::GetForProfile(profile);
 
   // TODO(atwilson): Change AboutSigninInternalsFactory to load on startup
   // once http://crbug.com/171406 has been fixed.
   AboutSigninInternalsFactory::GetForProfile(profile);
 
   // TODO(tim): Currently, AUTO/MANUAL settings refer to the *first* time sync
   // is set up and *not* a browser restart for a manual-start platform (where
   // sync has already been set up, and should be able to start without user
   // intervention). We can get rid of the browser_default eventually, but
   // need to take care that ProfileSyncService doesn't get tripped up between
   // those two cases. Bug 88109.
   ProfileSyncService* pss = new ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       new ManagedUserSigninManagerWrapper(signin),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       behavior);
 
   pss->factory()->RegisterDataTypes(pss);
   pss->Initialize();
   return pss;
 }
 
 // static
 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
   return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL;
 }