Extract GCMClient data types into separate gcm_types.h

chrome/browser/services/gcm/gcm_service.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_SERVICES_GCM_GCM_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/services/gcm/default_gcm_app_handler.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "google_apis/gcm/gcm_client.h"
+#include "google_apis/gcm/public/gcm_types.h"
 
 namespace extensions {
 class ExtensionGCMAppHandlerTest;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace gcm {
 
 class GCMAppHandler;
 class GCMClientFactory;
 
 // A bridge between the GCM users in Chrome and the GCMClient layer.
 class GCMService : public IdentityProvider::Observer {
  public:
   typedef base::Callback<void(const std::string& registration_id,
-                              GCMClient::Result result)> RegisterCallback;
+                              Result result)> RegisterCallback;
   typedef base::Callback<void(const std::string& message_id,
-                              GCMClient::Result result)> SendCallback;
-  typedef base::Callback<void(GCMClient::Result result)> UnregisterCallback;
+                              Result result)> SendCallback;
+  typedef base::Callback<void(Result result)> UnregisterCallback;
   typedef base::Callback<void(const GCMClient::GCMStatistics& stats)>
       GetGCMStatisticsCallback;
 
   explicit GCMService(scoped_ptr<IdentityProvider> identity_provider);
   virtual ~GCMService();
 
   void Initialize(scoped_ptr<GCMClientFactory> gcm_client_factory);
 
   void Start();
 
@@ skipping 26 matching lines @@
   virtual void Unregister(const std::string& app_id,
                           UnregisterCallback callback);
 
   // Sends a message to a given receiver.
   // |app_id|: application ID.
   // |receiver_id|: registration ID of the receiver party.
   // |message|: message to be sent.
   // |callback|: to be called once the asynchronous operation is done.
   virtual void Send(const std::string& app_id,
                     const std::string& receiver_id,
-                    const GCMClient::OutgoingMessage& message,
+                    const OutgoingMessage& message,
                     SendCallback callback);
 
   // For testing purpose.
   GCMClient* GetGCMClientForTesting() const;
 
   // Returns true if the service was started.
   bool IsStarted() const;
 
   // Returns true if the gcm client is ready.
   bool IsGCMClientReady() const;
@@ skipping 33 matching lines @@
   // |identity_provider_| is able to supply an account ID.
   void EnsureLoaded();
 
   // Remove cached data when GCM service is stopped.
   void RemoveCachedData();
 
   // Checks out of GCM and erases any cached and persisted data.
   void CheckOut();
 
   // Ensures that the app is ready for GCM functions and events.
-  GCMClient::Result EnsureAppReady(const std::string& app_id);
+  Result EnsureAppReady(const std::string& app_id);
 
   // Should be called when an app with |app_id| is trying to un/register.
   // Checks whether another un/registration is in progress.
   bool IsAsyncOperationPending(const std::string& app_id) const;
 
   void DoRegister(const std::string& app_id,
                   const std::vector<std::string>& sender_ids);
   void DoUnregister(const std::string& app_id);
   void DoSend(const std::string& app_id,
               const std::string& receiver_id,
-              const GCMClient::OutgoingMessage& message);
+              const OutgoingMessage& message);
 
   // Callbacks posted from IO thread to UI thread.
   void RegisterFinished(const std::string& app_id,
                         const std::string& registration_id,
-                        GCMClient::Result result);
-  void UnregisterFinished(const std::string& app_id, GCMClient::Result result);
+                        Result result);
+  void UnregisterFinished(const std::string& app_id, Result result);
   void SendFinished(const std::string& app_id,
                     const std::string& message_id,
-                    GCMClient::Result result);
+                    Result result);
   void MessageReceived(const std::string& app_id,
-                       GCMClient::IncomingMessage message);
+                       IncomingMessage message);
   void MessagesDeleted(const std::string& app_id);
   void MessageSendError(const std::string& app_id,
-                        const GCMClient::SendErrorDetails& send_error_details);
+                        const SendErrorDetails& send_error_details);
   void GCMClientReady();
 
   // Returns the handler for the given app.
   GCMAppHandler* GetAppHandler(const std::string& app_id);
 
   void GetGCMStatisticsFinished(GCMClient::GCMStatistics stats);
 
   // Flag to indicate if GCMClient is ready.
   bool gcm_client_ready_;
 
@@ skipping 28 matching lines @@
 
   // Used to pass a weak pointer to the IO worker.
   base::WeakPtrFactory<GCMService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_SERVICE_H_