Extract GCMClient data types into separate gcm_types.h

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"
@@ skipping 57 matching lines @@
 }
 
 void ExtensionGCMAppHandler::ShutdownHandler() {
 #if !defined(OS_ANDROID)
   js_event_router_.reset();
 #endif
 }
 
 void ExtensionGCMAppHandler::OnMessage(
     const std::string& app_id,
-    const gcm::GCMClient::IncomingMessage& message) {
+    const gcm::IncomingMessage& message) {
 #if !defined(OS_ANDROID)
   js_event_router_->OnMessage(app_id, message);
 #endif
 }
 
 void ExtensionGCMAppHandler::OnMessagesDeleted(const std::string& app_id) {
 #if !defined(OS_ANDROID)
   js_event_router_->OnMessagesDeleted(app_id);
 #endif
 }
 
 void ExtensionGCMAppHandler::OnSendError(
     const std::string& app_id,
-    const gcm::GCMClient::SendErrorDetails& send_error_details) {
+    const gcm::SendErrorDetails& send_error_details) {
 #if !defined(OS_ANDROID)
   js_event_router_->OnSendError(app_id, send_error_details);
 #endif
 }
 
 void ExtensionGCMAppHandler::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
   if (IsGCMPermissionEnabled(extension))
     GetGCMProfileService()->AddAppHandler(extension->id(), this);
@@ skipping 21 matching lines @@
                    extension->id()));
     GetGCMProfileService()->RemoveAppHandler(extension->id());
   }
 }
 
 gcm::GCMProfileService* ExtensionGCMAppHandler::GetGCMProfileService() const {
   return gcm::GCMProfileServiceFactory::GetForProfile(profile_);
 }
 
 void ExtensionGCMAppHandler::OnUnregisterCompleted(
-    const std::string& app_id, gcm::GCMClient::Result result) {
+    const std::string& app_id, gcm::Result result) {
   // Nothing to do.
 }
 
 }  // namespace extensions