Extract Profile-independent GCMService from GCMProfileService

chrome/browser/extensions/extension_gcm_app_handler.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/gcm_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 #endif
@@ skipping 37 matching lines @@
 #endif
 }
 
 ExtensionGCMAppHandler::~ExtensionGCMAppHandler() {
   const ExtensionSet& enabled_extensions =
       ExtensionRegistry::Get(profile_)->enabled_extensions();
   for (ExtensionSet::const_iterator extension = enabled_extensions.begin();
        extension != enabled_extensions.end();
        ++extension) {
     if (IsGCMPermissionEnabled(extension->get()))
-      GetGCMProfileService()->RemoveAppHandler((*extension)->id());
+      GetGCMService()->RemoveAppHandler((*extension)->id());

[jianli, 2014/04/10 20:39:56]

Why? Extension is tied with profile.

[bartfab (slow), 2014/04/11 16:58:52]

I had made the change here to make it explicit that this particular piece of
code does not require the profile-specific version of GCMService. If you prefer
GCMProfileService being used here, no problem - I changed it back to the way it
was in extension_gcm_app_handler.*.

   }
 }
 
 void ExtensionGCMAppHandler::ShutdownHandler() {
 #if !defined(OS_ANDROID)
   js_event_router_.reset();
 #endif
 }
 
 void ExtensionGCMAppHandler::OnMessage(
@@ skipping 19 matching lines @@
 }
 
 void ExtensionGCMAppHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome:: NOTIFICATION_EXTENSION_LOADED: {
       const Extension* extension = content::Details<Extension>(details).ptr();
       if (IsGCMPermissionEnabled(extension))
-        GetGCMProfileService()->AddAppHandler(extension->id(), this);
+        GetGCMService()->AddAppHandler(extension->id(), this);
       break;
     }
     case chrome:: NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
       const Extension* extension =
           content::Details<UnloadedExtensionInfo>(details)->extension;
       if (IsGCMPermissionEnabled(extension))
-        GetGCMProfileService()->RemoveAppHandler(extension->id());
+        GetGCMService()->RemoveAppHandler(extension->id());
       break;
     }
     case chrome:: NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension = content::Details<Extension>(details).ptr();
       if (IsGCMPermissionEnabled(extension)) {
-        GetGCMProfileService()->Unregister(
+        GetGCMService()->Unregister(
             extension->id(),
             base::Bind(&ExtensionGCMAppHandler::OnUnregisterCompleted,
                        weak_factory_.GetWeakPtr(),
                        extension->id()));
-        GetGCMProfileService()->RemoveAppHandler(extension->id());
+        GetGCMService()->RemoveAppHandler(extension->id());
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
-gcm::GCMProfileService* ExtensionGCMAppHandler::GetGCMProfileService() const {
+gcm::GCMService* ExtensionGCMAppHandler::GetGCMService() const {
   return gcm::GCMProfileServiceFactory::GetForProfile(profile_);
 }
 
 void ExtensionGCMAppHandler::OnUnregisterCompleted(
     const std::string& app_id, gcm::GCMClient::Result result) {
   // Nothing to do.
 }
 
 }  // namespace extensions