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

chrome/browser/services/gcm/gcm_profile_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 
 #include <string>
 
 #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;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace gcm {
 
+class FakeGCMProfileService;
 class GCMClientFactory;
 class GCMDriver;
 
 #if defined(OS_CHROMEOS)
 class GCMConnectionObserver;
 #endif
 
 // Providing GCM service, via GCMDriver, to a profile.
 class GCMProfileService : public KeyedService {
  public:
   // 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
   GCMProfileService(Profile* profile,
                     scoped_ptr<GCMClientFactory> gcm_client_factory);
 #endif
   ~GCMProfileService() override;
 
   // KeyedService:
   void Shutdown() override;
 
   // 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();
 
  private:
   // The profile which owns this object.
   Profile* profile_;
 
   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;
   scoped_ptr<IdentityObserver> identity_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_