Move gcm-independent parts of push messaging out of gcm namespace and directory

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 <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 109 matching lines @@
 
 // static
 bool GCMProfileService::IsGCMEnabled(Profile* profile) {
 #if defined(OS_ANDROID)
   return true;
 #else
   return profile->GetPrefs()->GetBoolean(gcm::prefs::kGCMChannelStatus);
 #endif  // defined(OS_ANDROID)
 }
 
-// static
-void GCMProfileService::RegisterProfilePrefs(
-    user_prefs::PrefRegistrySyncable* registry) {
-  PushMessagingServiceImpl::RegisterProfilePrefs(registry);
-}
-
 #if defined(OS_ANDROID)
 static GCMProfileService* debug_instance = nullptr;
 
 GCMProfileService::GCMProfileService(Profile* profile)
     : profile_(profile),
       push_messaging_service_(this, profile) {
   CHECK(!profile->IsOffTheRecord());
 
   // TODO(johnme): Remove debug_instance and this logging code once
   // crbug.com/437827 is fixed.
@@ skipping 13 matching lines @@
                << profile->GetStartTime().ToInternalValue();
   }
   debug_instance = this;
 
   driver_.reset(new GCMDriverAndroid);
 }
 #else
 GCMProfileService::GCMProfileService(
     Profile* profile,
     scoped_ptr<GCMClientFactory> gcm_client_factory)
-    : profile_(profile),
-      push_messaging_service_(this, profile) {
+    : profile_(profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_ = CreateGCMDriverDesktop(
       gcm_client_factory.Pass(),
       profile_->GetPrefs(),
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext());
 
   identity_observer_.reset(new IdentityObserver(profile, driver_.get()));
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService()
-    : profile_(NULL),
-      push_messaging_service_(this, NULL) {
+    : profile_(NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
 #if defined(OS_ANDROID)
   debug_instance = nullptr;
 #endif
 }
 
 void GCMProfileService::Shutdown() {
 #if !defined(OS_ANDROID)
   identity_observer_.reset();
 #endif  // !defined(OS_ANDROID)
   if (driver_) {
     driver_->Shutdown();
     driver_.reset();
   }
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 #if !defined(OS_ANDROID)
   if (identity_observer_)
     identity_observer_.reset(new IdentityObserver(profile_, driver));
 #endif  // !defined(OS_ANDROID)
 }
 
 }  // namespace gcm