google_apis: Use base::MessageLoop.

BUG=236029
R=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/14383023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197106 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 28 insertions, 30 deletions

diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index c9fa1ef1..3d5079d 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -166,7 +166,7 @@ class GaiaAuthFetcherTest : public testing::Test {
   GURL oauth_login_gurl_;
   TestingProfile profile_;
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 };
 
 class MockGaiaConsumer : public GaiaAuthConsumer {
diff --git a/google_apis/gaia/gaia_authenticator.cc b/google_apis/gaia/gaia_authenticator.cc
index 42c4fbe..e5a40a2 100644
--- a/google_apis/gaia/gaia_authenticator.cc
+++ b/google_apis/gaia/gaia_authenticator.cc
@@ -85,7 +85,7 @@ bool GaiaAuthenticator::Authenticate(const string& user_name,
                                      const string& password,
                                      const string& captcha_token,
                                      const string& captcha_value) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
 
   AuthParams const params =
       MakeParams(user_name, password, captcha_token, captcha_value);
@@ -104,7 +104,7 @@ bool GaiaAuthenticator::AuthenticateWithLsid(const string& lsid) {
 }
 
 bool GaiaAuthenticator::AuthenticateImpl(const AuthParams& params) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   AuthResults results;
   const bool succeeded = AuthenticateImpl(params, &results);
   return succeeded;
@@ -120,7 +120,7 @@ bool GaiaAuthenticator::AuthenticateImpl(const AuthParams& params) {
 // method preserves the saved credentials.
 bool GaiaAuthenticator::AuthenticateImpl(const AuthParams& params,
                                          AuthResults* results) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   results->auth_error = ConnectionUnavailable;
   results->email = params.email.data();
   results->password = params.password;
@@ -156,7 +156,7 @@ bool GaiaAuthenticator::AuthenticateImpl(const AuthParams& params,
 
 bool GaiaAuthenticator::PerformGaiaRequest(const AuthParams& params,
                                            AuthResults* results) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   GURL gaia_auth_url(gaia_url_);
 
   string post_body;
@@ -208,7 +208,7 @@ bool GaiaAuthenticator::Post(const GURL& url,
 }
 
 bool GaiaAuthenticator::LookupEmail(AuthResults* results) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   // Use the provided Gaia server, but change the path to what V1 expects.
   GURL url(gaia_url_);  // Gaia server.
   GURL::Replacements repl;
@@ -258,7 +258,7 @@ int GaiaAuthenticator::GetBackoffDelaySeconds(int current_backoff_delay) {
 // token.
 bool GaiaAuthenticator::IssueAuthToken(AuthResults* results,
                                        const string& service_id) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   // Use the provided Gaia server, but change the path to what V1 expects.
   GURL url(gaia_url_);  // Gaia server.
   GURL::Replacements repl;
@@ -362,36 +362,36 @@ void GaiaAuthenticator::ExtractAuthErrorFrom(const string& response,
 // Reset all stored credentials, perhaps in preparation for letting a different
 // user sign in.
 void GaiaAuthenticator::ResetCredentials() {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   AuthResults blank;
   auth_results_ = blank;
 }
 
 void GaiaAuthenticator::SetUsernamePassword(const string& username,
                                             const string& password) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   auth_results_.password = password;
   auth_results_.email = username;
 }
 
 void GaiaAuthenticator::SetUsername(const string& username) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   auth_results_.email = username;
 }
 
 void GaiaAuthenticator::RenewAuthToken(const string& auth_token) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   DCHECK(!this->auth_token().empty());
   auth_results_.auth_token = auth_token;
 }
 void GaiaAuthenticator::SetAuthToken(const string& auth_token) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   auth_results_.auth_token = auth_token;
 }
 
 bool GaiaAuthenticator::Authenticate(const string& user_name,
                                      const string& password) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
+  DCHECK_EQ(base::MessageLoop::current(), message_loop_);
   const string empty;
   return Authenticate(user_name, password, empty,
                       empty);
diff --git a/google_apis/gaia/gaia_authenticator.h b/google_apis/gaia/gaia_authenticator.h
index 4aba67c..c9bf3bc 100644
--- a/google_apis/gaia/gaia_authenticator.h
+++ b/google_apis/gaia/gaia_authenticator.h
@@ -76,9 +76,7 @@ class GaiaAuthenticator {
 
   // This object should only be invoked from the AuthWatcherThread message
   // loop, which is injected here.
-  void set_message_loop(const MessageLoop* loop) {
-    message_loop_ = loop;
-  }
+  void set_message_loop(const base::MessageLoop* loop) { message_loop_ = loop; }
 
   // Pass credentials to authenticate with, or use saved credentials via an
   // overload. If authentication succeeds, you can retrieve the authentication
@@ -175,57 +173,57 @@ class GaiaAuthenticator {
  public:
   // Retrieve email.
   inline std::string email() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.email;
   }
 
   // Retrieve password.
   inline std::string password() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.password;
   }
 
   // Retrieve AuthToken, if previously authenticated; otherwise returns "".
   inline std::string auth_token() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.auth_token;
   }
 
   // Retrieve SID cookie. For details, see the Google Accounts documentation.
   inline std::string sid() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.sid;
   }
 
   // Retrieve LSID cookie. For details, see the Google Accounts documentation.
   inline std::string lsid() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.lsid;
   }
 
   // Get last authentication error.
   inline enum AuthenticationError auth_error() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.auth_error;
   }
 
   inline std::string auth_error_url() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.auth_error_url;
   }
 
   inline std::string captcha_token() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.captcha_token;
   }
 
   inline std::string captcha_url() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_.captcha_url;
   }
 
   inline AuthResults results() const {
-    DCHECK_EQ(MessageLoop::current(), message_loop_);
+    DCHECK_EQ(base::MessageLoop::current(), message_loop_);
     return auth_results_;
   }
 
@@ -266,7 +264,7 @@ class GaiaAuthenticator {
   int early_auth_attempt_count_;
 
   // The message loop all our methods are invoked on.
-  const MessageLoop* message_loop_;
+  const base::MessageLoop* message_loop_;
 };
 
 }  // namespace gaia
diff --git a/google_apis/gaia/gaia_authenticator_unittest.cc b/google_apis/gaia/gaia_authenticator_unittest.cc
index 50cb25a..de979e2 100644
--- a/google_apis/gaia/gaia_authenticator_unittest.cc
+++ b/google_apis/gaia/gaia_authenticator_unittest.cc
@@ -41,7 +41,7 @@ class GaiaAuthMockForGaiaAuthenticator : public GaiaAuthenticator {
 
 TEST(GaiaAuthenticatorTest, TestNewlineAtEndOfAuthTokenRemoved) {
   GaiaAuthMockForGaiaAuthenticator mock_auth;
-  MessageLoop message_loop;
+  base::MessageLoop message_loop;
   mock_auth.set_message_loop(&message_loop);
   GaiaAuthenticator::AuthResults results;
   EXPECT_TRUE(mock_auth.IssueAuthToken(&results, "sid"));
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 79a8d30..445fa48 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -128,7 +128,7 @@ class GaiaOAuthClientTest : public testing::Test {
 
   TestingProfile profile_;
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 };
 
 class MockGaiaOAuthClientDelegate : public gaia::GaiaOAuthClient::Delegate {
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
index 60e0ea3..3b2d451 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
@@ -110,7 +110,7 @@ class OAuth2AccessTokenFetcherTest : public testing::Test {
   }
 
  protected:
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   MockUrlFetcherFactory factory_;
   MockOAuth2AccessTokenConsumer consumer_;