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

chrome/browser/services/gcm/gcm_profile_service.cc

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 df86051bc60ecc2ab86f826ef97766e814a681a2..56132c29714fddc415157f4f32364fb097bd4a83 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -127,12 +127,6 @@ bool GCMProfileService::IsGCMEnabled(Profile* profile) {
 #endif  // defined(OS_ANDROID)
 }
 
-// static
-void GCMProfileService::RegisterProfilePrefs(
-    user_prefs::PrefRegistrySyncable* registry) {
-  PushMessagingServiceImpl::RegisterProfilePrefs(registry);
-}
-
 #if defined(OS_ANDROID)
 static GCMProfileService* debug_instance = nullptr;
 
@@ -166,8 +160,7 @@ GCMProfileService::GCMProfileService(Profile* profile)
 GCMProfileService::GCMProfileService(
     Profile* profile,
     scoped_ptr<GCMClientFactory> gcm_client_factory)
-    : profile_(profile),
-      push_messaging_service_(this, profile) {
+    : profile_(profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_ = CreateGCMDriverDesktop(
@@ -181,8 +174,7 @@ GCMProfileService::GCMProfileService(
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService()
-    : profile_(NULL),
-      push_messaging_service_(this, NULL) {
+    : profile_(NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
@@ -209,4 +201,8 @@ void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
 #endif  // !defined(OS_ANDROID)
 }
 
+gcm::FakeGCMProfileService* gcm::GCMProfileService::AsFakeGCMProfileService() {
+  return NULL;
+}
+
 }  // namespace gcm