summaryrefslogtreecommitdiffstats
path: root/dbus
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 /dbus
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 'dbus')
-rw-r--r--dbus/bus.cc2
-rw-r--r--dbus/bus_unittest.cc6
-rw-r--r--dbus/end_to_end_async_unittest.cc6
-rw-r--r--dbus/object_manager_unittest.cc4
-rw-r--r--dbus/property_unittest.cc4
-rw-r--r--dbus/signal_sender_verification_unittest.cc6
-rw-r--r--dbus/test_server.cc2
7 files changed, 15 insertions, 15 deletions
diff --git a/dbus/bus.cc b/dbus/bus.cc
index 2f1300a..388911a 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -201,7 +201,7 @@ Bus::Bus(const Options& options)
// The origin message loop is unnecessary if the client uses synchronous
// functions only.
if (base::MessageLoop::current())
- origin_task_runner_ = base::MessageLoop::current()->message_loop_proxy();
+ origin_task_runner_ = base::MessageLoop::current()->task_runner();
}
Bus::~Bus() {
diff --git a/dbus/bus_unittest.cc b/dbus/bus_unittest.cc
index 22ccddc..1e84fa5 100644
--- a/dbus/bus_unittest.cc
+++ b/dbus/bus_unittest.cc
@@ -137,7 +137,7 @@ TEST(BusTest, RemoveObjectProxy) {
// Create the bus.
Bus::Options options;
- options.dbus_task_runner = dbus_thread.message_loop_proxy();
+ options.dbus_task_runner = dbus_thread.task_runner();
scoped_refptr<Bus> bus = new Bus(options);
ASSERT_FALSE(bus->shutdown_completed());
@@ -217,7 +217,7 @@ TEST(BusTest, UnregisterExportedObject) {
// Create the bus.
Bus::Options options;
- options.dbus_task_runner = dbus_thread.message_loop_proxy();
+ options.dbus_task_runner = dbus_thread.task_runner();
scoped_refptr<Bus> bus = new Bus(options);
ASSERT_FALSE(bus->shutdown_completed());
@@ -267,7 +267,7 @@ TEST(BusTest, ShutdownAndBlockWithDBusThread) {
// Create the bus.
Bus::Options options;
- options.dbus_task_runner = dbus_thread.message_loop_proxy();
+ options.dbus_task_runner = dbus_thread.task_runner();
scoped_refptr<Bus> bus = new Bus(options);
ASSERT_FALSE(bus->shutdown_completed());
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc
index 10516b9..3854721 100644
--- a/dbus/end_to_end_async_unittest.cc
+++ b/dbus/end_to_end_async_unittest.cc
@@ -47,7 +47,7 @@ class EndToEndAsyncTest : public testing::Test {
// Start the test service, using the D-Bus thread.
TestService::Options options;
- options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread_->task_runner();
test_service_.reset(new TestService(options));
ASSERT_TRUE(test_service_->StartService());
ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
@@ -57,7 +57,7 @@ class EndToEndAsyncTest : public testing::Test {
Bus::Options bus_options;
bus_options.bus_type = Bus::SESSION;
bus_options.connection_type = Bus::PRIVATE;
- bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ bus_options.dbus_task_runner = dbus_thread_->task_runner();
bus_ = new Bus(bus_options);
object_proxy_ = bus_->GetObjectProxy(
"org.chromium.TestService",
@@ -138,7 +138,7 @@ class EndToEndAsyncTest : public testing::Test {
bus_options.bus_type = Bus::CUSTOM_ADDRESS;
bus_options.address = kInvalidAddress;
bus_options.connection_type = Bus::PRIVATE;
- bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ bus_options.dbus_task_runner = dbus_thread_->task_runner();
bus_ = new Bus(bus_options);
ASSERT_TRUE(bus_->HasDBusThread());
diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc
index 76ddb85..34f7ac4 100644
--- a/dbus/object_manager_unittest.cc
+++ b/dbus/object_manager_unittest.cc
@@ -70,7 +70,7 @@ class ObjectManagerTest
// Start the test service, using the D-Bus thread.
TestService::Options options;
- options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread_->task_runner();
test_service_.reset(new TestService(options));
ASSERT_TRUE(test_service_->StartService());
ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
@@ -80,7 +80,7 @@ class ObjectManagerTest
Bus::Options bus_options;
bus_options.bus_type = Bus::SESSION;
bus_options.connection_type = Bus::PRIVATE;
- bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ bus_options.dbus_task_runner = dbus_thread_->task_runner();
bus_ = new Bus(bus_options);
ASSERT_TRUE(bus_->HasDBusThread());
diff --git a/dbus/property_unittest.cc b/dbus/property_unittest.cc
index 5208f84..59faa22 100644
--- a/dbus/property_unittest.cc
+++ b/dbus/property_unittest.cc
@@ -61,7 +61,7 @@ class PropertyTest : public testing::Test {
// Start the test service, using the D-Bus thread.
TestService::Options options;
- options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread_->task_runner();
test_service_.reset(new TestService(options));
ASSERT_TRUE(test_service_->StartService());
ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
@@ -71,7 +71,7 @@ class PropertyTest : public testing::Test {
Bus::Options bus_options;
bus_options.bus_type = Bus::SESSION;
bus_options.connection_type = Bus::PRIVATE;
- bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ bus_options.dbus_task_runner = dbus_thread_->task_runner();
bus_ = new Bus(bus_options);
object_proxy_ = bus_->GetObjectProxy(
"org.chromium.TestService",
diff --git a/dbus/signal_sender_verification_unittest.cc b/dbus/signal_sender_verification_unittest.cc
index 0f718a4..0cedda7 100644
--- a/dbus/signal_sender_verification_unittest.cc
+++ b/dbus/signal_sender_verification_unittest.cc
@@ -44,7 +44,7 @@ class SignalSenderVerificationTest : public testing::Test {
Bus::Options bus_options;
bus_options.bus_type = Bus::SESSION;
bus_options.connection_type = Bus::PRIVATE;
- bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ bus_options.dbus_task_runner = dbus_thread_->task_runner();
bus_ = new Bus(bus_options);
object_proxy_ = bus_->GetObjectProxy(
"org.chromium.TestService",
@@ -71,7 +71,7 @@ class SignalSenderVerificationTest : public testing::Test {
// Start the test service, using the D-Bus thread.
TestService::Options options;
- options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread_->task_runner();
test_service_.reset(new TestService(options));
ASSERT_TRUE(test_service_->StartService());
ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
@@ -278,7 +278,7 @@ TEST_F(SignalSenderVerificationTest, TestOwnerStealing) {
// Start a test service that allows theft, using the D-Bus thread.
TestService::Options options;
- options.dbus_task_runner = dbus_thread_->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread_->task_runner();
options.request_ownership_options = Bus::REQUIRE_PRIMARY_ALLOW_REPLACEMENT;
TestService stealable_test_service(options);
ASSERT_TRUE(stealable_test_service.StartService());
diff --git a/dbus/test_server.cc b/dbus/test_server.cc
index 7e4722d..1b63064 100644
--- a/dbus/test_server.cc
+++ b/dbus/test_server.cc
@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
CHECK(dbus_thread->StartWithOptions(thread_options));
dbus::TestService::Options options;
- options.dbus_task_runner = dbus_thread->message_loop_proxy();
+ options.dbus_task_runner = dbus_thread->task_runner();
dbus::TestService* test_service = new dbus::TestService(options);
CHECK(test_service->StartService());
CHECK(test_service->WaitUntilServiceIsStarted());