Extract Profile-independent GCMService from GCMProfileService

chrome/browser/extensions/extension_gcm_app_handler.h

 // Copyright 2014 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_EXTENSIONS_EXTENSION_GCM_APP_HANDLER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_GCM_APP_HANDLER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/services/gcm/gcm_app_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "google_apis/gcm/gcm_client.h"
 
 class Profile;
 namespace content {
 class BrowserContext;
 }
 namespace gcm {
-class GCMProfileService;
+class GCMService;
 }
 
 namespace extensions {
 
 class GcmJsEventRouter;
 
 // Defines the interface to provide handling logic for a given app.
 class ExtensionGCMAppHandler : public gcm::GCMAppHandler,
                                public BrowserContextKeyedAPI,
                                public content::NotificationObserver {
@@ skipping 20 matching lines @@
                                      gcm::GCMClient::Result result);
 
  private:
   friend class BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  gcm::GCMProfileService* GetGCMProfileService() const;
+  gcm::GCMService* GetGCMService() const;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "ExtensionGCMAppHandler"; }
   static const bool kServiceIsNULLWhileTesting = true;
 
   Profile* profile_;
   content::NotificationRegistrar registrar_;
 
 #if !defined(OS_ANDROID)
   scoped_ptr<extensions::GcmJsEventRouter> js_event_router_;
 #endif
 
   base::WeakPtrFactory<ExtensionGCMAppHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionGCMAppHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_GCM_APP_HANDLER_H_