Remove calls to deprecated MessageLoop methods in google_apis.

google_apis/gaia/oauth2_token_service_request_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 "google_apis/gaia/oauth2_token_service_request.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 154 matching lines @@
 void OAuth2TokenServiceRequestTest::SetUp() {
   scopes_.insert(kScope);
   oauth2_service_.reset(new MockOAuth2TokenService);
   oauth2_service_->AddAccount(kAccountId);
   provider_ =
       new Provider(base::ThreadTaskRunnerHandle::Get(), oauth2_service_.get());
 }
 
 void OAuth2TokenServiceRequestTest::TearDown() {
   // Run the loop to execute any pending tasks that may free resources.
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 }
 
 OAuth2TokenServiceRequestTest::Provider::Provider(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     OAuth2TokenService* token_service)
     : task_runner_(task_runner), token_service_(token_service) {
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 OAuth2TokenServiceRequestTest::Provider::GetTokenServiceTaskRunner() {
   return task_runner_;
 }
 
 OAuth2TokenService* OAuth2TokenServiceRequestTest::Provider::GetTokenService() {
   return token_service_;
 }
 
 OAuth2TokenServiceRequestTest::Provider::~Provider() {
 }
 
 TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Failure) {
   oauth2_service_->SetResponse(
       GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE),
       std::string(),
       base::Time());
   std::unique_ptr<OAuth2TokenServiceRequest> request(
       OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
                                                 scopes_, &consumer_));
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, consumer_.num_get_token_success_);
   EXPECT_EQ(1, consumer_.num_get_token_failure_);
   EXPECT_EQ(GoogleServiceAuthError::SERVICE_UNAVAILABLE,
             consumer_.last_error_.state());
   EXPECT_EQ(0, oauth2_service_->num_invalidate_token());
 }
 
 TEST_F(OAuth2TokenServiceRequestTest, CreateAndStart_Success) {
   std::unique_ptr<OAuth2TokenServiceRequest> request(
       OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
                                                 scopes_, &consumer_));
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, consumer_.num_get_token_success_);
   EXPECT_EQ(0, consumer_.num_get_token_failure_);
   EXPECT_EQ(kAccessToken, consumer_.last_token_);
   EXPECT_EQ(0, oauth2_service_->num_invalidate_token());
 }
 
 TEST_F(OAuth2TokenServiceRequestTest,
        CreateAndStart_DestroyRequestBeforeCompletes) {
   std::unique_ptr<OAuth2TokenServiceRequest> request(
       OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
                                                 scopes_, &consumer_));
   request.reset();
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, consumer_.num_get_token_success_);
   EXPECT_EQ(0, consumer_.num_get_token_failure_);
   EXPECT_EQ(0, oauth2_service_->num_invalidate_token());
 }
 
 TEST_F(OAuth2TokenServiceRequestTest,
        CreateAndStart_DestroyRequestAfterCompletes) {
   std::unique_ptr<OAuth2TokenServiceRequest> request(
       OAuth2TokenServiceRequest::CreateAndStart(provider_.get(), kAccountId,
                                                 scopes_, &consumer_));
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   request.reset();
   EXPECT_EQ(1, consumer_.num_get_token_success_);
   EXPECT_EQ(0, consumer_.num_get_token_failure_);
   EXPECT_EQ(kAccessToken, consumer_.last_token_);
   EXPECT_EQ(0, oauth2_service_->num_invalidate_token());
 }
 
 TEST_F(OAuth2TokenServiceRequestTest, InvalidateToken) {
   OAuth2TokenServiceRequest::InvalidateToken(
       provider_.get(), kAccountId, scopes_, kAccessToken);
-  ui_loop_.RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, consumer_.num_get_token_success_);
   EXPECT_EQ(0, consumer_.num_get_token_failure_);
   EXPECT_EQ(kAccessToken, oauth2_service_->last_token_invalidated());
   EXPECT_EQ(1, oauth2_service_->num_invalidate_token());
 }
 
 }  // namespace