diff options
Diffstat (limited to 'jingle/notifier')
7 files changed, 7 insertions, 7 deletions
diff --git a/jingle/notifier/base/weak_xmpp_client_unittest.cc b/jingle/notifier/base/weak_xmpp_client_unittest.cc index d4d5043..b97f623 100644 --- a/jingle/notifier/base/weak_xmpp_client_unittest.cc +++ b/jingle/notifier/base/weak_xmpp_client_unittest.cc @@ -60,7 +60,7 @@ class WeakXmppClientTest : public testing::Test { } // Needed by TaskPump. - MessageLoop message_loop_; + base::MessageLoop message_loop_; scoped_ptr<jingle_glue::TaskPump> task_pump_; MockXmppDelegate mock_xmpp_delegate_; diff --git a/jingle/notifier/base/xmpp_connection.cc b/jingle/notifier/base/xmpp_connection.cc index 603b474..2f926ec 100644 --- a/jingle/notifier/base/xmpp_connection.cc +++ b/jingle/notifier/base/xmpp_connection.cc @@ -80,7 +80,7 @@ XmppConnection::~XmppConnection() { DCHECK(CalledOnValidThread()); ClearClient(); task_pump_->Stop(); - MessageLoop* current_message_loop = MessageLoop::current(); + base::MessageLoop* current_message_loop = base::MessageLoop::current(); CHECK(current_message_loop); // We do this because XmppConnection may get destroyed as a result // of a signal from XmppClient. If we delete |task_pump_| here, bad diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index 686e949..3255fdc 100644 --- a/jingle/notifier/base/xmpp_connection_unittest.cc +++ b/jingle/notifier/base/xmpp_connection_unittest.cc @@ -86,7 +86,7 @@ class XmppConnectionTest : public testing::Test { } // Needed by XmppConnection. - MessageLoop message_loop_; + base::MessageLoop message_loop_; MockXmppConnectionDelegate mock_xmpp_connection_delegate_; scoped_ptr<MockPreXmppAuth> mock_pre_xmpp_auth_; scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_; diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc index 4d009c2..fcfbe77 100644 --- a/jingle/notifier/communicator/single_login_attempt_unittest.cc +++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc @@ -106,7 +106,7 @@ class SingleLoginAttemptTest : public ::testing::Test { } private: - MessageLoop message_loop_; + base::MessageLoop message_loop_; const LoginSettings login_settings_; protected: diff --git a/jingle/notifier/listener/non_blocking_push_client_unittest.cc b/jingle/notifier/listener/non_blocking_push_client_unittest.cc index fea26fe..46bb9b8 100644 --- a/jingle/notifier/listener/non_blocking_push_client_unittest.cc +++ b/jingle/notifier/listener/non_blocking_push_client_unittest.cc @@ -56,7 +56,7 @@ class NonBlockingPushClientTest : public testing::Test { return scoped_ptr<PushClient>(fake_push_client_); } - MessageLoop message_loop_; + base::MessageLoop message_loop_; FakePushClientObserver fake_observer_; scoped_ptr<NonBlockingPushClient> push_client_; // Owned by |push_client_|. diff --git a/jingle/notifier/listener/push_client_unittest.cc b/jingle/notifier/listener/push_client_unittest.cc index 44d4d98..d9677ae 100644 --- a/jingle/notifier/listener/push_client_unittest.cc +++ b/jingle/notifier/listener/push_client_unittest.cc @@ -29,7 +29,7 @@ class PushClientTest : public testing::Test { virtual ~PushClientTest() {} // The sockets created by the XMPP code expect an IO loop. - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; NotifierOptions notifier_options_; }; diff --git a/jingle/notifier/listener/xmpp_push_client_unittest.cc b/jingle/notifier/listener/xmpp_push_client_unittest.cc index 8d4c669..2e59ab2 100644 --- a/jingle/notifier/listener/xmpp_push_client_unittest.cc +++ b/jingle/notifier/listener/xmpp_push_client_unittest.cc @@ -53,7 +53,7 @@ class XmppPushClientTest : public testing::Test { } // The sockets created by the XMPP code expect an IO loop. - MessageLoopForIO message_loop_; + base::MessageLoopForIO message_loop_; NotifierOptions notifier_options_; StrictMock<MockObserver> mock_observer_; scoped_ptr<XmppPushClient> xmpp_push_client_; |