summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-06-16 18:59:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-17 01:59:37 +0000
commit8c36b0c96bee3fea8e5b125bacae03d3c537a386 (patch)
tree996f965f465c0c3aa2944dfdd0144fde4b1da4e1 /google_apis
parent792e5c7507e94dca8d9f9f5aeabd44d3bbf1cb73 (diff)
downloadchromium_src-8c36b0c96bee3fea8e5b125bacae03d3c537a386.zip
chromium_src-8c36b0c96bee3fea8e5b125bacae03d3c537a386.tar.gz
chromium_src-8c36b0c96bee3fea8e5b125bacae03d3c537a386.tar.bz2
google_apis: Migrate callers of message_loop_proxy() to task_runner()
Migrate callers of {MessageLoop,Thread}::message_loop_proxy() to {MessageLoop,Thread}::task_runner(). Since the types at the call sites have already been updated, this is just a bulk rename. BUG=465354 Review URL: https://codereview.chromium.org/1184713004 Cr-Commit-Position: refs/heads/master@{#334768}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/drive/base_requests_server_unittest.cc4
-rw-r--r--google_apis/drive/base_requests_unittest.cc4
-rw-r--r--google_apis/drive/drive_api_requests_unittest.cc4
-rw-r--r--google_apis/gaia/account_tracker_unittest.cc2
-rw-r--r--google_apis/gaia/gaia_auth_fetcher_unittest.cc2
-rw-r--r--google_apis/gaia/gaia_oauth_client_unittest.cc2
-rw-r--r--google_apis/gaia/oauth2_api_call_flow_unittest.cc2
-rw-r--r--google_apis/gaia/oauth2_token_service_unittest.cc2
-rw-r--r--google_apis/gcm/engine/checkin_request_unittest.cc2
-rw-r--r--google_apis/gcm/engine/gcm_store_impl_unittest.cc2
-rw-r--r--google_apis/gcm/engine/mcs_client_unittest.cc2
-rw-r--r--google_apis/gcm/engine/registration_request_unittest.cc2
-rw-r--r--google_apis/gcm/engine/unregistration_request_unittest.cc2
-rw-r--r--google_apis/gcm/tools/mcs_probe.cc4
14 files changed, 18 insertions, 18 deletions
diff --git a/google_apis/drive/base_requests_server_unittest.cc b/google_apis/drive/base_requests_server_unittest.cc
index 1a8111b..c4fe388 100644
--- a/google_apis/drive/base_requests_server_unittest.cc
+++ b/google_apis/drive/base_requests_server_unittest.cc
@@ -37,12 +37,12 @@ class BaseRequestsServerTest : public testing::Test {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
request_context_getter_ = new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy());
+ message_loop_.task_runner());
request_sender_.reset(new RequestSender(
new DummyAuthService,
request_context_getter_.get(),
- message_loop_.message_loop_proxy(),
+ message_loop_.task_runner(),
kTestUserAgent));
ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc
index 95e35e5..fc9cdca 100644
--- a/google_apis/drive/base_requests_unittest.cc
+++ b/google_apis/drive/base_requests_unittest.cc
@@ -108,11 +108,11 @@ class BaseRequestsTest : public testing::Test {
void SetUp() override {
request_context_getter_ = new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy());
+ message_loop_.task_runner());
sender_.reset(new RequestSender(new DummyAuthService,
request_context_getter_.get(),
- message_loop_.message_loop_proxy(),
+ message_loop_.task_runner(),
std::string() /* custom user agent */));
ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc
index 5e11fbd..b3e96ee1 100644
--- a/google_apis/drive/drive_api_requests_unittest.cc
+++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -120,11 +120,11 @@ class DriveApiRequestsTest : public testing::Test {
void SetUp() override {
request_context_getter_ = new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy());
+ message_loop_.task_runner());
request_sender_.reset(new RequestSender(new DummyAuthService,
request_context_getter_.get(),
- message_loop_.message_loop_proxy(),
+ message_loop_.task_runner(),
kTestUserAgent));
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
diff --git a/google_apis/gaia/account_tracker_unittest.cc b/google_apis/gaia/account_tracker_unittest.cc
index 532ed35..61fded9 100644
--- a/google_apis/gaia/account_tracker_unittest.cc
+++ b/google_apis/gaia/account_tracker_unittest.cc
@@ -275,7 +275,7 @@ class IdentityAccountTrackerTest : public testing::Test {
account_tracker_.reset(
new AccountTracker(fake_identity_provider_.get(),
new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())));
+ message_loop_.task_runner())));
account_tracker_->AddObserver(&observer_);
}
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index 15372cc..7bab642 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -156,7 +156,7 @@ class GaiaAuthFetcherTest : public testing::Test {
net::TestURLRequestContextGetter* GetRequestContext() {
if (!request_context_getter_.get()) {
request_context_getter_ = new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy());
+ message_loop_.task_runner());
}
return request_context_getter_.get();
}
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index d181df1..18bda59 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -188,7 +188,7 @@ class GaiaOAuthClientTest : public testing::Test {
net::TestURLRequestContextGetter* GetRequestContext() {
if (!request_context_getter_.get()) {
request_context_getter_ = new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy());
+ message_loop_.task_runner());
}
return request_context_getter_.get();
}
diff --git a/google_apis/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
index 1222ae3..d537bb7 100644
--- a/google_apis/gaia/oauth2_api_call_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
@@ -99,7 +99,7 @@ class OAuth2ApiCallFlowTest : public testing::Test {
protected:
OAuth2ApiCallFlowTest()
: request_context_getter_(new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())) {}
+ message_loop_.task_runner())) {}
TestURLFetcher* CreateURLFetcher(
const GURL& url, bool fetch_succeeds,
diff --git a/google_apis/gaia/oauth2_token_service_unittest.cc b/google_apis/gaia/oauth2_token_service_unittest.cc
index 0cf0c65..138ba86 100644
--- a/google_apis/gaia/oauth2_token_service_unittest.cc
+++ b/google_apis/gaia/oauth2_token_service_unittest.cc
@@ -95,7 +95,7 @@ class OAuth2TokenServiceTest : public testing::Test {
void SetUp() override {
oauth2_service_.reset(
new TestOAuth2TokenService(new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())));
+ message_loop_.task_runner())));
account_id_ = "test_user@gmail.com";
}
diff --git a/google_apis/gcm/engine/checkin_request_unittest.cc b/google_apis/gcm/engine/checkin_request_unittest.cc
index a7c7db2..1fa0efc 100644
--- a/google_apis/gcm/engine/checkin_request_unittest.cc
+++ b/google_apis/gcm/engine/checkin_request_unittest.cc
@@ -101,7 +101,7 @@ CheckinRequestTest::CheckinRequestTest()
security_token_(kBlankSecurityToken),
checkin_device_type_(0),
url_request_context_getter_(new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())) {
+ message_loop_.task_runner())) {
}
CheckinRequestTest::~CheckinRequestTest() {}
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index 2b0c401..442f898 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -83,7 +83,7 @@ scoped_ptr<GCMStoreImpl> GCMStoreImplTest::BuildGCMStore() {
// behavior in the production code. Currently GCMStoreImpl checks if
// the directory exist or not to determine the store existence.
temp_directory_.path().Append(FILE_PATH_LITERAL("GCM Store")),
- message_loop_.message_loop_proxy(),
+ message_loop_.task_runner(),
make_scoped_ptr<Encryptor>(new FakeEncryptor)));
}
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc
index 44d8bc3..6c7ea72 100644
--- a/google_apis/gcm/engine/mcs_client_unittest.cc
+++ b/google_apis/gcm/engine/mcs_client_unittest.cc
@@ -189,7 +189,7 @@ void MCSClientTest::SetUp() {
void MCSClientTest::BuildMCSClient() {
gcm_store_.reset(new GCMStoreImpl(
temp_directory_.path(),
- message_loop_.message_loop_proxy(),
+ message_loop_.task_runner(),
make_scoped_ptr<Encryptor>(new FakeEncryptor)));
mcs_client_.reset(new TestMCSClient(&clock_,
&connection_factory_,
diff --git a/google_apis/gcm/engine/registration_request_unittest.cc b/google_apis/gcm/engine/registration_request_unittest.cc
index 4f9ea25..39764db 100644
--- a/google_apis/gcm/engine/registration_request_unittest.cc
+++ b/google_apis/gcm/engine/registration_request_unittest.cc
@@ -93,7 +93,7 @@ RegistrationRequestTest::RegistrationRequestTest()
status_(RegistrationRequest::SUCCESS),
callback_called_(false),
url_request_context_getter_(new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())) {}
+ message_loop_.task_runner())) {}
RegistrationRequestTest::~RegistrationRequestTest() {}
diff --git a/google_apis/gcm/engine/unregistration_request_unittest.cc b/google_apis/gcm/engine/unregistration_request_unittest.cc
index cfdd588..2cdde2a 100644
--- a/google_apis/gcm/engine/unregistration_request_unittest.cc
+++ b/google_apis/gcm/engine/unregistration_request_unittest.cc
@@ -85,7 +85,7 @@ UnregistrationRequestTest::UnregistrationRequestTest()
: callback_called_(false),
status_(UnregistrationRequest::UNREGISTRATION_STATUS_COUNT),
url_request_context_getter_(new net::TestURLRequestContextGetter(
- message_loop_.message_loop_proxy())) {}
+ message_loop_.task_runner())) {}
UnregistrationRequestTest::~UnregistrationRequestTest() {}
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index e1bd244..eadd3b5 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -299,7 +299,7 @@ void MCSProbe::Start() {
&recorder_));
gcm_store_.reset(
new GCMStoreImpl(gcm_store_path_,
- file_thread_.message_loop_proxy(),
+ file_thread_.task_runner(),
make_scoped_ptr<Encryptor>(new FakeEncryptor)));
mcs_client_.reset(new MCSClient("probe",
&clock_,
@@ -482,7 +482,7 @@ int MCSProbeMain(int argc, char* argv[]) {
// For check-in and creating registration ids.
const scoped_refptr<MyTestURLRequestContextGetter> context_getter =
new MyTestURLRequestContextGetter(
- base::MessageLoop::current()->message_loop_proxy());
+ base::MessageLoop::current()->task_runner());
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();