Extract GCMClient data types into separate gcm_types.h

chrome/browser/invalidation/gcm_invalidation_bridge.cc

Index: chrome/browser/invalidation/gcm_invalidation_bridge.cc
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.cc b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
index 88d09719bbc2d22714263cbd472d72c70ad64467..ab2f9a5132d4dea0f7392862a448938c51a9020b 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
@@ -55,7 +55,7 @@ class GCMInvalidationBridge::Core : public syncer::GCMNetworkChannelDelegate,
 
   void RegisterFinished(RegisterCallback callback,
                         const std::string& registration_id,
-                        gcm::GCMClient::Result result);
+                        gcm::Result result);
 
   void OnIncomingMessage(const std::string& message,
                          const std::string& echo_token);
@@ -135,7 +135,7 @@ void GCMInvalidationBridge::Core::RequestTokenFinished(
 void GCMInvalidationBridge::Core::RegisterFinished(
     RegisterCallback callback,
     const std::string& registration_id,
-    gcm::GCMClient::Result result) {
+    gcm::Result result) {
   DCHECK(CalledOnValidThread());
   callback.Run(registration_id, result);
 }
@@ -259,7 +259,7 @@ void GCMInvalidationBridge::Register(
 void GCMInvalidationBridge::RegisterFinished(
     syncer::GCMNetworkChannelDelegate::RegisterCallback callback,
     const std::string& registration_id,
-    gcm::GCMClient::Result result) {
+    gcm::Result result) {
   DCHECK(CalledOnValidThread());
   core_thread_task_runner_->PostTask(
       FROM_HERE,
@@ -286,8 +286,8 @@ void GCMInvalidationBridge::ShutdownHandler() {
 
 void GCMInvalidationBridge::OnMessage(
     const std::string& app_id,
-    const gcm::GCMClient::IncomingMessage& message) {
-  gcm::GCMClient::MessageData::const_iterator it;
+    const gcm::IncomingMessage& message) {
+  gcm::MessageData::const_iterator it;
   std::string content;
   std::string echo_token;
   it = message.data.find(kContentKey);
@@ -313,7 +313,7 @@ void GCMInvalidationBridge::OnMessagesDeleted(const std::string& app_id) {
 
 void GCMInvalidationBridge::OnSendError(
     const std::string& app_id,
-    const gcm::GCMClient::SendErrorDetails& send_error_details) {
+    const gcm::SendErrorDetails& send_error_details) {
   // cacheinvalidation doesn't send messages over GCM.
   NOTREACHED();
 }