Extract GCMClient data types into separate gcm_types.h

google_apis/gcm/gcm_client.h

 // Copyright 2013 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 GOOGLE_APIS_GCM_GCM_CLIENT_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
+#include "google_apis/gcm/public/gcm_types.h"
 
 template <class T> class scoped_refptr;
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
 namespace checkin_proto {
 class ChromeBuildProto;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace gcm {
 
 // Interface that encapsulates the network communications with the Google Cloud
 // Messaging server. This interface is not supposed to be thread-safe.
 class GCM_EXPORT GCMClient {
  public:
-  enum Result {
-    // Successful operation.
-    SUCCESS,
-    // Invalid parameter.
-    INVALID_PARAMETER,
-    // Profile not signed in.
-    NOT_SIGNED_IN,
-    // Previous asynchronous operation is still pending to finish. Certain
-    // operation, like register, is only allowed one at a time.
-    ASYNC_OPERATION_PENDING,
-    // Network socket error.
-    NETWORK_ERROR,
-    // Problem at the server.
-    SERVER_ERROR,
-    // Exceeded the specified TTL during message sending.
-    TTL_EXCEEDED,
-    // Other errors.
-    UNKNOWN_ERROR
-  };
-
-  // Message data consisting of key-value pairs.
-  typedef std::map<std::string, std::string> MessageData;
-
-  // Message to be delivered to the other party.
-  struct GCM_EXPORT OutgoingMessage {
-    OutgoingMessage();
-    ~OutgoingMessage();
-
-    // Message ID.
-    std::string id;
-    // In seconds.
-    int time_to_live;
-    MessageData data;
-  };
-
-  // Message being received from the other party.
-  struct GCM_EXPORT IncomingMessage {
-    IncomingMessage();
-    ~IncomingMessage();
-
-    MessageData data;
-    std::string collapse_key;
-    std::string sender_id;
-  };
-
-  // Detailed information of the Send Error event.
-  struct GCM_EXPORT SendErrorDetails {
-    SendErrorDetails();
-    ~SendErrorDetails();
-
-    std::string message_id;
-    MessageData additional_data;
-    Result result;
-  };
-
   // Internal states and activity statistics of a GCM client.
   struct GCM_EXPORT GCMStatistics {
    public:
     GCMStatistics();
     ~GCMStatistics();
 
     bool is_recording;
     bool gcm_client_created;
     std::string gcm_client_state;
     bool connection_client_created;
@@ skipping 15 matching lines @@
     // |registration_id|: non-empty if the registration completed successfully.
     // |result|: the type of the error if an error occured, success otherwise.
     virtual void OnRegisterFinished(const std::string& app_id,
                                     const std::string& registration_id,
                                     Result result) = 0;
 
     // Called when the unregistration completed.
     // |app_id|: application ID.
     // |result|: result of the unregistration.
     virtual void OnUnregisterFinished(const std::string& app_id,
-                                      GCMClient::Result result) = 0;
+                                      Result result) = 0;
 
     // Called when the message is scheduled to send successfully or an error
     // occurs.
     // |app_id|: application ID.
     // |message_id|: ID of the message being sent.
     // |result|: the type of the error if an error occured, success otherwise.
     virtual void OnSendFinished(const std::string& app_id,
                                 const std::string& message_id,
                                 Result result) = 0;
 
@@ skipping 83 matching lines @@
   // Clear all recorded GCM activity logs.
   virtual void ClearActivityLogs() = 0;
 
   // Gets internal states and statistics.
   virtual GCMStatistics GetStatistics() const = 0;
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_H_