Index: chrome/browser/services/gcm/gcm_profile_service.cc |
diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc |
index d4ab7028ab9c9d37dcb7bd9edae2f13c0fb56062..c36391ec68318352c5b304844741444c7604d0f5 100644 |
--- a/chrome/browser/services/gcm/gcm_profile_service.cc |
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc |
@@ -40,12 +40,13 @@ void GCMProfileService::RegisterProfilePrefs( |
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); |
@@ -55,7 +56,7 @@ 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( |
@@ -71,7 +72,7 @@ GCMProfileService::GCMProfileService( |
GCMProfileService::GCMProfileService() |
: profile_(NULL), |
- push_messaging_service_(this) { |
+ push_messaging_service_(this, NULL) { |
} |
GCMProfileService::~GCMProfileService() { |