Extract GCMClient data types into separate gcm_types.h

sync/notifier/gcm_network_channel_unittest.cc

 // 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.
 
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/notifier/gcm_network_channel.h"
@@ skipping 231 matching lines @@
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
   EXPECT_FALSE(delegate()->message_callback.is_null());
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          std::string(),
                                          net::HTTP_NO_CONTENT,
                                          net::URLRequestStatus::SUCCESS);
 
   // 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
   // started yet.
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(url_fetchers_created_count(), 0);
   // Return valid access token. This should trigger HTTP request.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
 
   // Return another access token. Message should be cleared by now and shouldn't
   // be sent.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token2");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
   EXPECT_EQ(INVALIDATIONS_ENABLED, get_last_invalidator_state());
 }
 
 TEST_F(GCMNetworkChannelTest, FailedRegister) {
   // After construction GCMNetworkChannel should have called Register.
   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_);
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage shouldn't trigger RequestToken.
   EXPECT_TRUE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(0, url_fetchers_created_count());
 }
 
 TEST_F(GCMNetworkChannelTest, RegisterFinishesAfterSendMessage) {
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          "",
                                          net::HTTP_NO_CONTENT,
                                          net::URLRequestStatus::SUCCESS);
 
   // After construction GCMNetworkChannel should have called Register.
   EXPECT_FALSE(delegate()->register_callback.is_null());
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage shouldn't trigger RequestToken.
   EXPECT_TRUE(delegate()->request_token_callback.is_null());
   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);
   // Return valid access token. This should trigger HTTP request.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
 }
 
 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
   // started yet.
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(url_fetchers_created_count(), 0);
   // RequestToken returns failure.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::FromConnectionError(1), "");
 
   // Should be no HTTP requests.
   EXPECT_EQ(url_fetchers_created_count(), 0);
 }
 
 TEST_F(GCMNetworkChannelTest, AuthErrorFromServer) {
   // Setup fake response to return AUTH_ERROR.
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          "",
                                          net::HTTP_UNAUTHORIZED,
                                          net::URLRequestStatus::SUCCESS);
 
   // 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
   // started yet.
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(url_fetchers_created_count(), 0);
   // Return valid access token. This should trigger HTTP request.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
   EXPECT_EQ(delegate()->invalidated_token, "access.token");
 }
 
 // Following two tests are to check for memory leaks/crashes when Register and
 // RequestToken don't complete by the teardown.
 TEST_F(GCMNetworkChannelTest, RegisterNeverCompletes) {
   network_channel()->SendMessage("abra.cadabra");
   // Register should be called by now. Let's not complete and see what happens.
   EXPECT_FALSE(delegate()->register_callback.is_null());
 }
 
 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());
 }
 
 TEST_F(GCMNetworkChannelTest, Base64EncodeDecode) {
   std::string input;
   std::string plain;
   std::string base64;
   // Empty string.
@@ skipping 20 matching lines @@
 }
 
 TEST_F(GCMNetworkChannelTest, TransientError) {
   EXPECT_FALSE(delegate()->message_callback.is_null());
   // POST will fail.
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          std::string(),
                                          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());
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
   // Failing HTTP POST should cause TRANSIENT_INVALIDATION_ERROR.
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
   // Network change to CONNECTION_NONE shouldn't affect invalidator state.
@@ skipping 21 matching lines @@
   EXPECT_TRUE(Base64DecodeURLSafe(parts[parts.size() - 1], &buffer));
 }
 
 TEST_F(GCMNetworkChannelTest, EchoToken) {
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          std::string(),
                                          net::HTTP_OK,
                                          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.
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
   EXPECT_TRUE(get_last_echo_token().empty());
 
   // Trigger response.
@@ skipping 15 matching lines @@
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 3);
   // Echo_token should be from second message.
   EXPECT_EQ("echo.token", get_last_echo_token());
 }
 #endif
 
 }  // namespace syncer