summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-06-17 08:46:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-17 15:46:47 +0000
commit8a033aaf2d76655ce5686cd80b36a759582dcd6d (patch)
tree30d8ad67ad8eef6ed14a4b7de82c809df50fa74c /sync
parentd5399555b35888360dea6c774236bcf573ef1bac (diff)
downloadchromium_src-8a033aaf2d76655ce5686cd80b36a759582dcd6d.zip
chromium_src-8a033aaf2d76655ce5686cd80b36a759582dcd6d.tar.gz
chromium_src-8a033aaf2d76655ce5686cd80b36a759582dcd6d.tar.bz2
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 TBR=armansito@chromium.org Review URL: https://codereview.chromium.org/1179163002 Cr-Commit-Position: refs/heads/master@{#334840}
Diffstat (limited to 'sync')
-rw-r--r--sync/internal_api/attachments/attachment_downloader_impl_unittest.cc2
-rw-r--r--sync/internal_api/attachments/attachment_service_proxy_unittest.cc2
-rw-r--r--sync/internal_api/attachments/attachment_uploader_impl_unittest.cc4
-rw-r--r--sync/internal_api/http_bridge_unittest.cc20
-rw-r--r--sync/test/fake_server/fake_server_network_resources.cc2
-rw-r--r--sync/tools/sync_client.cc2
-rw-r--r--sync/tools/sync_listen_notifications.cc2
-rw-r--r--sync/util/get_session_name_unittest.cc2
8 files changed, 18 insertions, 18 deletions
diff --git a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc b/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc
index 0cae099..9cf16b4 100644
--- a/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_downloader_impl_unittest.cc
@@ -205,7 +205,7 @@ class AttachmentDownloaderImplTest : public testing::Test {
void AttachmentDownloaderImplTest::SetUp() {
url_request_context_getter_ =
- new net::TestURLRequestContextGetter(message_loop_.message_loop_proxy());
+ new net::TestURLRequestContextGetter(message_loop_.task_runner());
url_fetcher_factory_.set_remove_fetcher_on_delete(true);
token_service_.reset(new MockOAuth2TokenService());
token_service_->AddAccount(kAccountId);
diff --git a/sync/internal_api/attachments/attachment_service_proxy_unittest.cc b/sync/internal_api/attachments/attachment_service_proxy_unittest.cc
index fe52f46..059a252 100644
--- a/sync/internal_api/attachments/attachment_service_proxy_unittest.cc
+++ b/sync/internal_api/attachments/attachment_service_proxy_unittest.cc
@@ -85,7 +85,7 @@ class AttachmentServiceProxyTest : public testing::Test,
stub_thread.reset(new base::Thread("attachment service stub thread"));
stub_thread->Start();
stub.reset(new StubAttachmentService);
- proxy.reset(new AttachmentServiceProxy(stub_thread->message_loop_proxy(),
+ proxy.reset(new AttachmentServiceProxy(stub_thread->task_runner(),
stub->AsWeakPtr()));
callback_get_or_download =
diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
index 527b00e..882b575 100644
--- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
@@ -277,10 +277,10 @@ void AttachmentUploaderImplTest::OnRequestReceived(const HttpRequest& request) {
void AttachmentUploaderImplTest::SetUp() {
DCHECK(CalledOnValidThread());
- request_handler_.reset(new RequestHandler(message_loop_.message_loop_proxy(),
+ request_handler_.reset(new RequestHandler(message_loop_.task_runner(),
weak_ptr_factory_.GetWeakPtr()));
url_request_context_getter_ =
- new net::TestURLRequestContextGetter(message_loop_.message_loop_proxy());
+ new net::TestURLRequestContextGetter(message_loop_.task_runner());
ASSERT_TRUE(server_.InitializeAndWaitUntilReady());
server_.RegisterRequestHandler(
diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc
index 4ab93fd..3c6db88 100644
--- a/sync/internal_api/http_bridge_unittest.cc
+++ b/sync/internal_api/http_bridge_unittest.cc
@@ -53,7 +53,7 @@ class SyncHttpBridgeTest : public testing::Test {
HttpBridge* BuildBridge() {
if (!fake_default_request_context_getter_) {
fake_default_request_context_getter_ =
- new net::TestURLRequestContextGetter(io_thread_.message_loop_proxy());
+ new net::TestURLRequestContextGetter(io_thread_.task_runner());
fake_default_request_context_getter_->AddRef();
}
HttpBridge* bridge =
@@ -159,7 +159,7 @@ void SyncHttpBridgeTest::RunSyncThreadBridgeUseTest(
base::WaitableEvent* signal_when_created,
base::WaitableEvent* signal_when_released) {
scoped_refptr<net::URLRequestContextGetter> ctx_getter(
- new net::TestURLRequestContextGetter(io_thread_.message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread_.task_runner()));
{
scoped_refptr<ShuntedHttpBridge> bridge(
new ShuntedHttpBridge(ctx_getter.get(), this, true));
@@ -190,7 +190,7 @@ TEST_F(SyncHttpBridgeTest, TestUsesSameHttpNetworkSession) {
// Test the HttpBridge without actually making any network requests.
TEST_F(SyncHttpBridgeTest, TestMakeSynchronousPostShunted) {
scoped_refptr<net::URLRequestContextGetter> ctx_getter(
- new net::TestURLRequestContextGetter(io_thread()->message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread()->task_runner()));
scoped_refptr<HttpBridge> http_bridge(
new ShuntedHttpBridge(ctx_getter.get(), this, false));
http_bridge->SetURL("http://www.google.com", 9999);
@@ -314,7 +314,7 @@ TEST_F(SyncHttpBridgeTest, TestResponseHeader) {
TEST_F(SyncHttpBridgeTest, Abort) {
scoped_refptr<net::URLRequestContextGetter> ctx_getter(
- new net::TestURLRequestContextGetter(io_thread()->message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread()->task_runner()));
scoped_refptr<ShuntedHttpBridge> http_bridge(
new ShuntedHttpBridge(ctx_getter.get(), this, true));
http_bridge->SetURL("http://www.google.com", 9999);
@@ -323,7 +323,7 @@ TEST_F(SyncHttpBridgeTest, Abort) {
int os_error = 0;
int response_code = 0;
- io_thread()->message_loop_proxy()->PostTask(
+ io_thread()->task_runner()->PostTask(
FROM_HERE,
base::Bind(&SyncHttpBridgeTest::Abort, http_bridge));
bool success = http_bridge->MakeSynchronousPost(&os_error, &response_code);
@@ -333,7 +333,7 @@ TEST_F(SyncHttpBridgeTest, Abort) {
TEST_F(SyncHttpBridgeTest, AbortLate) {
scoped_refptr<net::URLRequestContextGetter> ctx_getter(
- new net::TestURLRequestContextGetter(io_thread()->message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread()->task_runner()));
scoped_refptr<ShuntedHttpBridge> http_bridge(
new ShuntedHttpBridge(ctx_getter.get(), this, false));
http_bridge->SetURL("http://www.google.com", 9999);
@@ -367,7 +367,7 @@ TEST_F(SyncHttpBridgeTest, AbortAndReleaseBeforeFetchComplete) {
// Stop IO so we can control order of operations.
base::WaitableEvent io_waiter(false, false);
- ASSERT_TRUE(io_thread()->message_loop_proxy()->PostTask(
+ ASSERT_TRUE(io_thread()->task_runner()->PostTask(
FROM_HERE,
base::Bind(&base::WaitableEvent::Wait, base::Unretained(&io_waiter))));
@@ -384,7 +384,7 @@ TEST_F(SyncHttpBridgeTest, AbortAndReleaseBeforeFetchComplete) {
fetcher.set_response_code(200);
fetcher.set_cookies(cookies);
fetcher.SetResponseString(response_content);
- ASSERT_TRUE(io_thread()->message_loop_proxy()->PostTask(
+ ASSERT_TRUE(io_thread()->task_runner()->PostTask(
FROM_HERE,
base::Bind(&net::URLFetcherDelegate::OnURLFetchComplete,
base::Unretained(delegate), &fetcher)));
@@ -446,7 +446,7 @@ TEST_F(SyncHttpBridgeTest, RequestContextGetterReleaseOrder) {
syncer::HttpPostProviderInterface* bridge = NULL;
scoped_refptr<net::URLRequestContextGetter> baseline_context_getter(
- new net::TestURLRequestContextGetter(io_thread()->message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread()->task_runner()));
base::WaitableEvent signal_when_created(false, false);
base::WaitableEvent wait_for_shutdown(false, false);
@@ -496,7 +496,7 @@ TEST_F(SyncHttpBridgeTest, EarlyAbortFactory) {
// simplicity, this test uses only one thread.
scoped_refptr<net::URLRequestContextGetter> baseline_context_getter(
- new net::TestURLRequestContextGetter(io_thread()->message_loop_proxy()));
+ new net::TestURLRequestContextGetter(io_thread()->task_runner()));
CancelationSignal release_request_context_signal;
// UI Thread: Initialize the HttpBridgeFactory. The next step would be to
diff --git a/sync/test/fake_server/fake_server_network_resources.cc b/sync/test/fake_server/fake_server_network_resources.cc
index 4750230..8d7c647 100644
--- a/sync/test/fake_server/fake_server_network_resources.cc
+++ b/sync/test/fake_server/fake_server_network_resources.cc
@@ -31,7 +31,7 @@ FakeServerNetworkResources::GetHttpPostProviderFactory(
return make_scoped_ptr<syncer::HttpPostProviderFactory>(
new FakeServerHttpPostProviderFactory(
fake_server_,
- base::MessageLoop::current()->message_loop_proxy()));
+ base::MessageLoop::current()->task_runner()));
}
} // namespace fake_server
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index a433fa9..f46d39b 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -330,7 +330,7 @@ int SyncClientMain(int argc, char* argv[]) {
// Set up sync notifier factory.
const scoped_refptr<MyTestURLRequestContextGetter> context_getter =
- new MyTestURLRequestContextGetter(io_thread.message_loop_proxy());
+ new MyTestURLRequestContextGetter(io_thread.task_runner());
const notifier::NotifierOptions& notifier_options =
ParseNotifierOptions(command_line, context_getter);
syncer::NetworkChannelCreator network_channel_creator =
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index c6cc11f..6f6f534 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -179,7 +179,7 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
const notifier::NotifierOptions& notifier_options =
ParseNotifierOptions(
command_line,
- new MyTestURLRequestContextGetter(io_thread.message_loop_proxy()));
+ new MyTestURLRequestContextGetter(io_thread.task_runner()));
syncer::NetworkChannelCreator network_channel_creator =
syncer::NonBlockingInvalidator::MakePushClientChannelCreator(
notifier_options);
diff --git a/sync/util/get_session_name_unittest.cc b/sync/util/get_session_name_unittest.cc
index 724cd8b..2a77d4a 100644
--- a/sync/util/get_session_name_unittest.cc
+++ b/sync/util/get_session_name_unittest.cc
@@ -64,7 +64,7 @@ TEST_F(GetSessionNameTest, GetSessionNameSynchronouslyChromebox) {
// with a session name. Makes sure the returned session name is equal
// to the return value of GetSessionNameSynchronouslyForTesting().
TEST_F(GetSessionNameTest, GetSessionName) {
- GetSessionName(message_loop_.message_loop_proxy(),
+ GetSessionName(message_loop_.task_runner(),
base::Bind(&GetSessionNameTest::SetSessionNameAndQuit,
base::Unretained(this)));
message_loop_.Run();