Extract GCMClient data types into separate gcm_types.h

sync/notifier/gcm_network_channel.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 SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
 #define SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 
 // POD with copy of some statuses for debugging purposes.
 struct GCMNetworkChannelDiagnostic {
   explicit GCMNetworkChannelDiagnostic(GCMNetworkChannel* parent);
 
   // Collect all the internal variables in a single readable dictionary.
   scoped_ptr<base::DictionaryValue> CollectDebugData() const;
 
   // TODO(pavely): Move this toString to a more appropiate place in GCMClient.
   std::string GCMClientResultToString(
-      const gcm::GCMClient::Result result) const;
+      const gcm::Result result) const;
 
   GCMNetworkChannel* parent_;
   bool last_message_empty_echo_token_;
   base::Time last_message_received_time_;
   int last_post_response_code_;
   std::string registration_id_;
-  gcm::GCMClient::Result registration_result_;
+  gcm::Result registration_result_;
   int sent_messages_count_;
 };
 
 // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes
 // messages through GCMService.
 class SYNC_EXPORT_PRIVATE GCMNetworkChannel
     : public SyncNetworkChannel,
       public net::URLFetcherDelegate,
       public net::NetworkChangeNotifier::NetworkChangeObserver,
       public base::NonThreadSafe {
@@ skipping 26 matching lines @@
  protected:
   void ResetRegisterBackoffEntryForTest(
       const net::BackoffEntry::Policy* policy);
 
   virtual GURL BuildUrl(const std::string& registration_id);
 
  private:
   friend class GCMNetworkChannelTest;
   void Register();
   void OnRegisterComplete(const std::string& registration_id,
-                          gcm::GCMClient::Result result);
+                          gcm::Result result);
   void RequestAccessToken();
   void OnGetTokenComplete(const GoogleServiceAuthError& error,
                           const std::string& token);
   void OnIncomingMessage(const std::string& message,
                          const std::string& echo_token);
 
   // Base64 encoding/decoding with URL safe alphabet.
   // http://tools.ietf.org/html/rfc4648#page-7
   static void Base64EncodeURLSafe(const std::string& input,
                                   std::string* output);
@@ skipping 25 matching lines @@
   GCMNetworkChannelDiagnostic diagnostic_info_;
 
   base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_