Extract GCMClient data types into separate gcm_types.h

sync/notifier/gcm_network_channel_unittest.cc

Index: sync/notifier/gcm_network_channel_unittest.cc
diff --git a/sync/notifier/gcm_network_channel_unittest.cc b/sync/notifier/gcm_network_channel_unittest.cc
index 2564d0b9d2fd63230df0059d2580f0e3880b6e9a..201697cd212646cee54e78a191940c7f852ea871 100644
--- a/sync/notifier/gcm_network_channel_unittest.cc
+++ b/sync/notifier/gcm_network_channel_unittest.cc
@@ -249,7 +249,7 @@ TEST_F(GCMNetworkChannelTest, HappyCase) {
   // After construction GCMNetworkChannel should have called Register.
   EXPECT_FALSE(delegate()->register_callback.is_null());
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage should have triggered RequestToken. No HTTP request should be
@@ -276,12 +276,12 @@ TEST_F(GCMNetworkChannelTest, FailedRegister) {
   EXPECT_FALSE(delegate()->register_callback.is_null());
   EXPECT_EQ(1, delegate()->register_call_count_);
   // Return transient error from Register call.
-  delegate()->register_callback.Run("", gcm::GCMClient::NETWORK_ERROR);
+  delegate()->register_callback.Run("", gcm::RESULT_NETWORK_ERROR);
   RunLoopUntilIdle();
   // GcmNetworkChannel should have scheduled Register retry.
   EXPECT_EQ(2, delegate()->register_call_count_);
   // Return persistent error from Register call.
-  delegate()->register_callback.Run("", gcm::GCMClient::NOT_SIGNED_IN);
+  delegate()->register_callback.Run("", gcm::RESULT_NOT_SIGNED_IN);
   RunLoopUntilIdle();
   // GcmNetworkChannel should give up trying.
   EXPECT_EQ(2, delegate()->register_call_count_);
@@ -307,7 +307,7 @@ TEST_F(GCMNetworkChannelTest, RegisterFinishesAfterSendMessage) {
   EXPECT_EQ(url_fetchers_created_count(), 0);
 
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(url_fetchers_created_count(), 0);
@@ -322,7 +322,7 @@ TEST_F(GCMNetworkChannelTest, RequestTokenFailure) {
   // After construction GCMNetworkChannel should have called Register.
   EXPECT_FALSE(delegate()->register_callback.is_null());
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage should have triggered RequestToken. No HTTP request should be
@@ -347,7 +347,7 @@ TEST_F(GCMNetworkChannelTest, AuthErrorFromServer) {
   // After construction GCMNetworkChannel should have called Register.
   EXPECT_FALSE(delegate()->register_callback.is_null());
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage should have triggered RequestToken. No HTTP request should be
@@ -373,7 +373,7 @@ TEST_F(GCMNetworkChannelTest, RegisterNeverCompletes) {
 TEST_F(GCMNetworkChannelTest, RequestTokenNeverCompletes) {
   network_channel()->SendMessage("abra.cadabra");
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
   // RequestToken should be called by now. Let's not complete and see what
   // happens.
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
@@ -414,7 +414,7 @@ TEST_F(GCMNetworkChannelTest, TransientError) {
                                          net::HTTP_SERVICE_UNAVAILABLE,
                                          net::URLRequestStatus::SUCCESS);
 
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
@@ -456,7 +456,7 @@ TEST_F(GCMNetworkChannelTest, EchoToken) {
                                          net::URLRequestStatus::SUCCESS);
   // After construction GCMNetworkChannel should have called Register.
   // Return valid registration id.
-  delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
+  delegate()->register_callback.Run("registration.id", gcm::RESULT_SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   // Return valid access token. This should trigger HTTP request.