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

chrome/browser/services/gcm/gcm_profile_service.h

Index: chrome/browser/services/gcm/gcm_profile_service.h
diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
index 4adb01f9b29ca7c20224ff9e567a943411b38cac..34f4c94dbd3be255751bba6ff31e18591102ced3 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.h
+++ b/chrome/browser/services/gcm/gcm_profile_service.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/services/gcm/push_messaging_service_impl.h"
+#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;
@@ -21,6 +21,7 @@ class PrefRegistrySyncable;
 
 namespace gcm {
 
+class FakeGCMProfileService;
 class GCMClientFactory;
 class GCMDriver;
 
@@ -34,9 +35,6 @@ class GCMProfileService : public KeyedService {
   // Returns whether GCM is enabled for |profile|.
   static bool IsGCMEnabled(Profile* profile);
 
-  // Register profile-specific prefs for GCM.
-  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
-
 #if defined(OS_ANDROID)
   explicit GCMProfileService(Profile* profile);
 #else
@@ -50,13 +48,10 @@ class GCMProfileService : public KeyedService {
 
   // For testing purpose.
   void SetDriverForTesting(GCMDriver* driver);
+  virtual FakeGCMProfileService* AsFakeGCMProfileService();

[Peter Beverloo, 2015/03/03 15:54:18]

I'm not a huge fan of this. Could we perhaps just static_cast<> if we really
have to?

 
   GCMDriver* driver() const { return driver_.get(); }
 
-  content::PushMessagingService* push_messaging_service() {
-    return &push_messaging_service_;
-  }
-
  protected:
   // Used for constructing fake GCMProfileService for testing purpose.
   GCMProfileService();
@@ -67,9 +62,6 @@ class GCMProfileService : public KeyedService {
 
   scoped_ptr<GCMDriver> driver_;
 
-  // Implementation of content::PushMessagingService using GCMProfileService.
-  PushMessagingServiceImpl push_messaging_service_;
-
   // Used for both account tracker and GCM.UserSignedIn UMA.
 #if !defined(OS_ANDROID)
   class IdentityObserver;