Extract GCMClient data types into separate gcm_types.h

chrome/browser/extensions/api/gcm/gcm_api.h

Index: chrome/browser/extensions/api/gcm/gcm_api.h
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.h b/chrome/browser/extensions/api/gcm/gcm_api.h
index e5447c0ea935cfe99ba7f0f71ccd486080b93e01..7bbc865ecabb0e2efc11c22ddb18d4348099747d 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.h
+++ b/chrome/browser/extensions/api/gcm/gcm_api.h
@@ -51,7 +51,7 @@ class GcmRegisterFunction : public GcmApiFunction {
 
  private:
   void CompleteFunctionWithResult(const std::string& registration_id,
-                                  gcm::GCMClient::Result result);
+                                  gcm::Result result);
 };
 
 class GcmUnregisterFunction : public GcmApiFunction {
@@ -67,7 +67,7 @@ class GcmUnregisterFunction : public GcmApiFunction {
   virtual bool DoWork() OVERRIDE FINAL;
 
  private:
-  void CompleteFunctionWithResult(gcm::GCMClient::Result result);
+  void CompleteFunctionWithResult(gcm::Result result);
 };
 
 class GcmSendFunction : public GcmApiFunction {
@@ -84,11 +84,11 @@ class GcmSendFunction : public GcmApiFunction {
 
  private:
   void CompleteFunctionWithResult(const std::string& message_id,
-                                  gcm::GCMClient::Result result);
+                                  gcm::Result result);
 
   // Validates that message data do not carry invalid keys and fit into
   // allowable size limits.
-  bool ValidateMessageData(const gcm::GCMClient::MessageData& data) const;
+  bool ValidateMessageData(const gcm::MessageData& data) const;
 };
 
 class GcmJsEventRouter : public EventRouter::Observer {
@@ -98,10 +98,10 @@ class GcmJsEventRouter : public EventRouter::Observer {
   virtual ~GcmJsEventRouter();
 
   void OnMessage(const std::string& app_id,
-                 const gcm::GCMClient::IncomingMessage& message);
+                 const gcm::IncomingMessage& message);
   void OnMessagesDeleted(const std::string& app_id);
   void OnSendError(const std::string& app_id,
-                   const gcm::GCMClient::SendErrorDetails& send_error_details);
+                   const gcm::SendErrorDetails& send_error_details);
 
   // EventRouter::Observer:
   virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE;