Extract GCMClient data types into separate gcm_types.h

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

Index: chrome/browser/extensions/api/gcm/gcm_apitest.cc
diff --git a/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chrome/browser/extensions/api/gcm/gcm_apitest.cc
index 0ce8663ff12ce2115d5434f3b4ee5022392556a5..376d654b0ed0ef2bd307598b7c770f0061659547 100644
--- a/chrome/browser/extensions/api/gcm/gcm_apitest.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_apitest.cc
@@ -19,29 +19,29 @@ namespace {
 
 const char kEventsExtension[] = "gcm/events";
 
-gcm::GCMClient::SendErrorDetails CreateErrorDetails(
+gcm::SendErrorDetails CreateErrorDetails(
     const std::string& message_id,
-    const gcm::GCMClient::Result result,
+    const gcm::Result result,
     const std::string& total_messages) {
-  gcm::GCMClient::SendErrorDetails error;
+  gcm::SendErrorDetails error;
   error.message_id = message_id;
   error.result = result;
   error.additional_data["expectedMessageId"] = message_id;
   switch (result) {
-    case gcm::GCMClient::ASYNC_OPERATION_PENDING:
+    case gcm::RESULT_ASYNC_OPERATION_PENDING:
       error.additional_data["expectedErrorMessage"] =
           "Asynchronous operation is pending.";
       break;
-    case gcm::GCMClient::SERVER_ERROR:
+    case gcm::RESULT_SERVER_ERROR:
       error.additional_data["expectedErrorMessage"] = "Server error occurred.";
       break;
-    case gcm::GCMClient::NETWORK_ERROR:
+    case gcm::RESULT_NETWORK_ERROR:
       error.additional_data["expectedErrorMessage"] = "Network error occurred.";
       break;
-    case gcm::GCMClient::TTL_EXCEEDED:
+    case gcm::RESULT_TTL_EXCEEDED:
       error.additional_data["expectedErrorMessage"] = "Time-to-live exceeded.";
       break;
-    case gcm::GCMClient::UNKNOWN_ERROR:
+    case gcm::RESULT_UNKNOWN_ERROR:
     default:  // Default case is the same as UNKNOWN_ERROR
       error.additional_data["expectedErrorMessage"] = "Unknown error occurred.";
       break;
@@ -132,8 +132,8 @@ IN_PROC_BROWSER_TEST_F(GcmApiTest, Register) {
 }
 
 IN_PROC_BROWSER_TEST_F(GcmApiTest, Unregister) {
-  service()->AddExpectedUnregisterResponse(gcm::GCMClient::SUCCESS);
-  service()->AddExpectedUnregisterResponse(gcm::GCMClient::SERVER_ERROR);
+  service()->AddExpectedUnregisterResponse(gcm::RESULT_SUCCESS);
+  service()->AddExpectedUnregisterResponse(gcm::RESULT_SERVER_ERROR);
 
   ASSERT_TRUE(RunExtensionTest("gcm/functions/unregister"));
 }
@@ -147,9 +147,9 @@ IN_PROC_BROWSER_TEST_F(GcmApiTest, SendMessageData) {
   ASSERT_TRUE(RunExtensionTest("gcm/functions/send_message_data"));
 
   EXPECT_EQ("destination-id", service()->last_receiver_id());
-  const gcm::GCMClient::OutgoingMessage& message =
+  const gcm::OutgoingMessage& message =
       service()->last_sent_message();
-  gcm::GCMClient::MessageData::const_iterator iter;
+  gcm::MessageData::const_iterator iter;
 
   EXPECT_TRUE((iter = message.data.find("key1")) != message.data.end());
   EXPECT_EQ("value1", iter->second);
@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(GcmApiTest, OnMessage) {
 
   extensions::ExtensionGCMAppHandler app_handler(profile());
 
-  gcm::GCMClient::IncomingMessage message;
+  gcm::IncomingMessage message;
   message.data["property1"] = "value1";
   message.data["property2"] = "value2";
   // First message is sent without a collapse key.
@@ -207,27 +207,27 @@ IN_PROC_BROWSER_TEST_F(GcmApiTest, OnSendError) {
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_1",
-                         gcm::GCMClient::ASYNC_OPERATION_PENDING,
+                         gcm::RESULT_ASYNC_OPERATION_PENDING,
                          total_expected_messages));
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_2",
-                         gcm::GCMClient::SERVER_ERROR,
+                         gcm::RESULT_SERVER_ERROR,
                          total_expected_messages));
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_3",
-                         gcm::GCMClient::NETWORK_ERROR,
+                         gcm::RESULT_NETWORK_ERROR,
                          total_expected_messages));
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_4",
-                         gcm::GCMClient::UNKNOWN_ERROR,
+                         gcm::RESULT_UNKNOWN_ERROR,
                          total_expected_messages));
   app_handler.OnSendError(
       extension->id(),
       CreateErrorDetails("error_message_5",
-                         gcm::GCMClient::TTL_EXCEEDED,
+                         gcm::RESULT_TTL_EXCEEDED,
                          total_expected_messages));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();