Extract GCMClient data types into separate gcm_types.h

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 <string>
 
 #include "base/compiler_specific.h"
@@ skipping 33 matching lines @@
   virtual ~ExtensionGCMAppHandler();
 
   // BrowserContextKeyedAPI implementation.
   static BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>*
   GetFactoryInstance();
 
   // gcm::GCMAppHandler implementation.
   virtual void ShutdownHandler() OVERRIDE;
   virtual void OnMessage(
       const std::string& app_id,
-      const gcm::GCMClient::IncomingMessage& message) OVERRIDE;
+      const gcm::IncomingMessage& message) OVERRIDE;
   virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
   virtual void OnSendError(
       const std::string& app_id,
-      const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
+      const gcm::SendErrorDetails& send_error_details) OVERRIDE;
 
  protected:
   virtual void OnUnregisterCompleted(const std::string& app_id,
-                                     gcm::GCMClient::Result result);
+                                     gcm::Result result);
 
  private:
   friend class BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ExtensionRegistryObserver implementation.
@@ skipping 22 matching lines @@
 #endif
 
   base::WeakPtrFactory<ExtensionGCMAppHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionGCMAppHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_GCM_APP_HANDLER_H_