Extract GCMClient data types into separate gcm_types.h

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

 // 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.
 
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 17 matching lines @@
 const char kInvalidParameter[] =
     "Function was called with invalid parameters.";
 const char kNotSignedIn[] = "Profile was not signed in.";
 const char kAsyncOperationPending[] =
     "Asynchronous operation is pending.";
 const char kNetworkError[] = "Network error occurred.";
 const char kServerError[] = "Server error occurred.";
 const char kTtlExceeded[] = "Time-to-live exceeded.";
 const char kUnknownError[] = "Unknown error occurred.";
 
-const char* GcmResultToError(gcm::GCMClient::Result result) {
+const char* GcmResultToError(gcm::Result result) {
   switch (result) {
-    case gcm::GCMClient::SUCCESS:
+    case gcm::RESULT_SUCCESS:
       return "";
-    case gcm::GCMClient::INVALID_PARAMETER:
+    case gcm::RESULT_INVALID_PARAMETER:
       return kInvalidParameter;
-    case gcm::GCMClient::NOT_SIGNED_IN:
+    case gcm::RESULT_NOT_SIGNED_IN:
       return kNotSignedIn;
-    case gcm::GCMClient::ASYNC_OPERATION_PENDING:
+    case gcm::RESULT_ASYNC_OPERATION_PENDING:
       return kAsyncOperationPending;
-    case gcm::GCMClient::NETWORK_ERROR:
+    case gcm::RESULT_NETWORK_ERROR:
       return kNetworkError;
-    case gcm::GCMClient::SERVER_ERROR:
+    case gcm::RESULT_SERVER_ERROR:
       return kServerError;
-    case gcm::GCMClient::TTL_EXCEEDED:
+    case gcm::RESULT_TTL_EXCEEDED:
       return kTtlExceeded;
-    case gcm::GCMClient::UNKNOWN_ERROR:
+    case gcm::RESULT_UNKNOWN_ERROR:
       return kUnknownError;
     default:
       NOTREACHED() << "Unexpected value of result cannot be converted: "
                    << result;
   }
 
   // Never reached, but prevents missing return statement warning.
   return "";
 }
 
@@ skipping 48 matching lines @@
   GCMProfileService()->Register(
       GetExtension()->id(),
       params->sender_ids,
       base::Bind(&GcmRegisterFunction::CompleteFunctionWithResult, this));
 
   return true;
 }
 
 void GcmRegisterFunction::CompleteFunctionWithResult(
     const std::string& registration_id,
-    gcm::GCMClient::Result result) {
+    gcm::Result result) {
   SetResult(new base::StringValue(registration_id));
   SetError(GcmResultToError(result));
-  SendResponse(gcm::GCMClient::SUCCESS == result);
+  SendResponse(gcm::RESULT_SUCCESS == result);
 }
 
 GcmUnregisterFunction::GcmUnregisterFunction() {}
 
 GcmUnregisterFunction::~GcmUnregisterFunction() {}
 
 bool GcmUnregisterFunction::DoWork() {
   GCMProfileService()->Unregister(
       GetExtension()->id(),
       base::Bind(&GcmUnregisterFunction::CompleteFunctionWithResult, this));
 
   return true;
 }
 
 void GcmUnregisterFunction::CompleteFunctionWithResult(
-    gcm::GCMClient::Result result) {
+    gcm::Result result) {
   SetError(GcmResultToError(result));
-  SendResponse(gcm::GCMClient::SUCCESS == result);
+  SendResponse(gcm::RESULT_SUCCESS == result);
 }
 
 GcmSendFunction::GcmSendFunction() {}
 
 GcmSendFunction::~GcmSendFunction() {}
 
 bool GcmSendFunction::DoWork() {
   scoped_ptr<api::gcm::Send::Params> params(
       api::gcm::Send::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   EXTENSION_FUNCTION_VALIDATE(
       ValidateMessageData(params->message.data.additional_properties));
 
-  gcm::GCMClient::OutgoingMessage outgoing_message;
+  gcm::OutgoingMessage outgoing_message;
   outgoing_message.id = params->message.message_id;
   outgoing_message.data = params->message.data.additional_properties;
   if (params->message.time_to_live.get())
     outgoing_message.time_to_live = *params->message.time_to_live;
 
   GCMProfileService()->Send(
       GetExtension()->id(),
       params->message.destination_id,
       outgoing_message,
       base::Bind(&GcmSendFunction::CompleteFunctionWithResult, this));
 
   return true;
 }
 
 void GcmSendFunction::CompleteFunctionWithResult(
     const std::string& message_id,
-    gcm::GCMClient::Result result) {
+    gcm::Result result) {
   SetResult(new base::StringValue(message_id));
   SetError(GcmResultToError(result));
-  SendResponse(gcm::GCMClient::SUCCESS == result);
+  SendResponse(gcm::RESULT_SUCCESS == result);
 }
 
 bool GcmSendFunction::ValidateMessageData(
-    const gcm::GCMClient::MessageData& data) const {
+    const gcm::MessageData& data) const {
   size_t total_size = 0u;
   for (std::map<std::string, std::string>::const_iterator iter = data.begin();
        iter != data.end(); ++iter) {
     total_size += iter->first.size() + iter->second.size();
 
     if (!IsMessageKeyValid(iter->first) ||
         kMaximumMessageSize < iter->first.size() ||
         kMaximumMessageSize < iter->second.size() ||
         kMaximumMessageSize < total_size)
       return false;
@@ skipping 13 matching lines @@
 }
 
 GcmJsEventRouter::~GcmJsEventRouter() {
   EventRouter* event_router = EventRouter::Get(profile_);
   if (event_router)
     event_router->UnregisterObserver(this);
 }
 
 void GcmJsEventRouter::OnMessage(
     const std::string& app_id,
-    const gcm::GCMClient::IncomingMessage& message) {
+    const gcm::IncomingMessage& message) {
   api::gcm::OnMessage::Message message_arg;
   message_arg.data.additional_properties = message.data;
   if (!message.collapse_key.empty())
     message_arg.collapse_key.reset(new std::string(message.collapse_key));
 
   scoped_ptr<Event> event(new Event(
       api::gcm::OnMessage::kEventName,
       api::gcm::OnMessage::Create(message_arg).Pass(),
       profile_));
   EventRouter::Get(profile_)->DispatchEventToExtension(app_id, event.Pass());
 }
 
 void GcmJsEventRouter::OnMessagesDeleted(const std::string& app_id) {
   scoped_ptr<Event> event(new Event(
       api::gcm::OnMessagesDeleted::kEventName,
       api::gcm::OnMessagesDeleted::Create().Pass(),
       profile_));
   EventRouter::Get(profile_)->DispatchEventToExtension(app_id, event.Pass());
 }
 
 void GcmJsEventRouter::OnSendError(
     const std::string& app_id,
-    const gcm::GCMClient::SendErrorDetails& send_error_details) {
+    const gcm::SendErrorDetails& send_error_details) {
   api::gcm::OnSendError::Error error;
   error.message_id.reset(new std::string(send_error_details.message_id));
   error.error_message = GcmResultToError(send_error_details.result);
   error.details.additional_properties = send_error_details.additional_data;
 
   scoped_ptr<Event> event(new Event(
       api::gcm::OnSendError::kEventName,
       api::gcm::OnSendError::Create(error).Pass(),
       profile_));
   EventRouter::Get(profile_)->DispatchEventToExtension(app_id, event.Pass());
 }
 
 void GcmJsEventRouter::OnListenerAdded(const EventListenerInfo& details) {
   if (gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
       gcm::GCMProfileService::ALWAYS_DISABLED) {
     return;
   }
   gcm::GCMProfileServiceFactory::GetForProfile(profile_)->Start();
 }
 
 }  // namespace extensions