summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/ibus
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 23:04:36 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 23:04:36 +0000
commitdf90563783a730f075af5df62e91d718d17107bb (patch)
tree575312351ec6ddaea9860c58d47c30bc18a05013 /chromeos/dbus/ibus
parent0488716e86b6a13209fa977fd0e0b89516a6a03c (diff)
downloadchromium_src-df90563783a730f075af5df62e91d718d17107bb.zip
chromium_src-df90563783a730f075af5df62e91d718d17107bb.tar.gz
chromium_src-df90563783a730f075af5df62e91d718d17107bb.tar.bz2
chromeos: Use base::MessageLoop.
BUG=236029 R=oshima@chromium.org Review URL: https://codereview.chromium.org/15774005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/ibus')
-rw-r--r--chromeos/dbus/ibus/ibus_client_unittest.cc2
-rw-r--r--chromeos/dbus/ibus/ibus_config_client_unittest.cc2
-rw-r--r--chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc6
-rw-r--r--chromeos/dbus/ibus/ibus_engine_service_unittest.cc6
-rw-r--r--chromeos/dbus/ibus/ibus_input_context_client_unittest.cc2
-rw-r--r--chromeos/dbus/ibus/ibus_panel_service_unittest.cc2
6 files changed, 10 insertions, 10 deletions
diff --git a/chromeos/dbus/ibus/ibus_client_unittest.cc b/chromeos/dbus/ibus/ibus_client_unittest.cc
index a76330a..3220e52 100644
--- a/chromeos/dbus/ibus/ibus_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_client_unittest.cc
@@ -155,7 +155,7 @@ class IBusClientTest : public testing::Test {
scoped_ptr<IBusClient> client_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
scoped_refptr<dbus::MockBus> mock_bus_;
scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
diff --git a/chromeos/dbus/ibus/ibus_config_client_unittest.cc b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
index f49fe86..5e636b9 100644
--- a/chromeos/dbus/ibus/ibus_config_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
@@ -330,7 +330,7 @@ class IBusConfigClientTest : public testing::Test {
scoped_ptr<IBusConfigClient> client_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
scoped_refptr<dbus::MockBus> mock_bus_;
scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
};
diff --git a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
index c3c2aa6..146e01a 100644
--- a/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_factory_service_unittest.cc
@@ -39,7 +39,7 @@ class SynchronousCreateEngineHandler {
class AsynchronousCreateEngineHandler {
public:
AsynchronousCreateEngineHandler(const dbus::ObjectPath& path,
- MessageLoop* message_loop)
+ base::MessageLoop* message_loop)
: path_(path),
message_loop_(message_loop) {}
@@ -49,7 +49,7 @@ class AsynchronousCreateEngineHandler {
private:
dbus::ObjectPath path_;
- MessageLoop* message_loop_;
+ base::MessageLoop* message_loop_;
DISALLOW_COPY_AND_ASSIGN(AsynchronousCreateEngineHandler);
};
@@ -126,7 +126,7 @@ class IBusEngineFactoryServiceTest : public testing::Test {
std::map<std::string, dbus::ExportedObject::MethodCallCallback>
method_exported_map_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
private:
// Used to implement the method call exportation.
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index 90dd53d..fc9c05f 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -166,7 +166,7 @@ class ProcessKeyEventHandler {
class DelayProcessKeyEventHandler {
public:
DelayProcessKeyEventHandler(bool expected_value,
- MessageLoop* message_loop)
+ base::MessageLoop* message_loop)
: expected_value_(expected_value),
message_loop_(message_loop) {
}
@@ -181,7 +181,7 @@ class DelayProcessKeyEventHandler {
private:
bool expected_value_;
- MessageLoop* message_loop_;
+ base::MessageLoop* message_loop_;
DISALLOW_COPY_AND_ASSIGN(DelayProcessKeyEventHandler);
};
@@ -494,7 +494,7 @@ class IBusEngineServiceTest : public testing::Test {
// The mock exported object.
scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
// The map from method call to method call handler.
std::map<std::string, dbus::ExportedObject::MethodCallCallback>
method_callback_map_;
diff --git a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
index 8e85a20..d8b4e2d 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
@@ -318,7 +318,7 @@ class IBusInputContextClientTest : public testing::Test {
dbus::Response* response_;
dbus::ErrorResponse* error_response_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
// The map from signal to signal handler.
std::map<std::string, dbus::ObjectProxy::SignalCallback> signal_callback_map_;
// Call count of OnSetCursorLocation.
diff --git a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
index edb9d2c..ec7aa74 100644
--- a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
@@ -325,7 +325,7 @@ class IBusPanelServiceTest : public testing::Test {
// The mock exported object.
scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
// A message loop to emulate asynchronous behavior.
- MessageLoop message_loop_;
+ base::MessageLoop message_loop_;
// The map from method call to method call handler.
std::map<std::string, dbus::ExportedObject::MethodCallCallback>
method_callback_map_;