Push API: register PushMessagingServiceImpl as GCMAppHandler.

chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 2013 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/services/gcm/gcm_profile_service.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 22 matching lines @@
   return profile->GetPrefs()->GetBoolean(prefs::kGCMChannelEnabled);
 }
 
 // static
 void GCMProfileService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kGCMChannelEnabled,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  PushMessagingServiceImpl::RegisterProfilePrefs(registry);
 }
 
 #if defined(OS_ANDROID)
 GCMProfileService::GCMProfileService(Profile* profile)
     : profile_(profile),
-      push_messaging_service_(this) {
+      push_messaging_service_(this, profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_.reset(new GCMDriverAndroid);
 }
 #else
 GCMProfileService::GCMProfileService(
     Profile* profile,
     scoped_ptr<GCMClientFactory> gcm_client_factory)
     : profile_(profile),
-      push_messaging_service_(this) {
+      push_messaging_service_(this, profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_ = CreateGCMDriverDesktop(
       gcm_client_factory.Pass(),
       scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
           SigninManagerFactory::GetForProfile(profile_),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
           LoginUIServiceFactory::GetForProfile(profile_))),
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext());
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService()
     : profile_(NULL),
-      push_messaging_service_(this) {
+      push_messaging_service_(this, NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
 }
 
 void GCMProfileService::AddAppHandler(const std::string& app_id,
                                       GCMAppHandler* handler) {
   if (driver_)
     driver_->AddAppHandler(app_id, handler);
 }
@@ skipping 15 matching lines @@
     driver_->Shutdown();
     driver_.reset();
   }
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 }
 
 }  // namespace gcm