| Index: chrome/common/net/notifier/listener/mediator_thread_impl.cc
|
| diff --git a/chrome/common/net/notifier/listener/mediator_thread_impl.cc b/chrome/common/net/notifier/listener/mediator_thread_impl.cc
|
| index d15e2c89b82bc3a6b91ccf835382a10940e05f75..76c270e75c8b94fb775c4d1d8d2827103f877c4c 100644
|
| --- a/chrome/common/net/notifier/listener/mediator_thread_impl.cc
|
| +++ b/chrome/common/net/notifier/listener/mediator_thread_impl.cc
|
| @@ -144,6 +144,24 @@ void MediatorThreadImpl::SendNotification(
|
| data));
|
| }
|
|
|
| +MessageLoop* MediatorThreadImpl::worker_message_loop() {
|
| + MessageLoop* current_message_loop = MessageLoop::current();
|
| + DCHECK(current_message_loop);
|
| + MessageLoop* worker_message_loop = worker_thread_.message_loop();
|
| + DCHECK(worker_message_loop);
|
| + DCHECK(current_message_loop == parent_message_loop_ ||
|
| + current_message_loop == worker_message_loop);
|
| + return worker_message_loop;
|
| +}
|
| +
|
| +buzz::XmppClient* MediatorThreadImpl::xmpp_client() {
|
| + DCHECK_EQ(MessageLoop::current(), worker_message_loop());
|
| + DCHECK(login_.get());
|
| + buzz::XmppClient* xmpp_client = login_->xmpp_client();
|
| + DCHECK(xmpp_client);
|
| + return xmpp_client;
|
| +}
|
| +
|
| void MediatorThreadImpl::DoLogin(
|
| const buzz::XmppClientSettings& settings) {
|
| DCHECK_EQ(MessageLoop::current(), worker_message_loop());
|
| @@ -359,22 +377,4 @@ void MediatorThreadImpl::OnSubscriptionStateChangeOnParentThread(
|
| }
|
| }
|
|
|
| -MessageLoop* MediatorThreadImpl::worker_message_loop() {
|
| - MessageLoop* current_message_loop = MessageLoop::current();
|
| - DCHECK(current_message_loop);
|
| - MessageLoop* worker_message_loop = worker_thread_.message_loop();
|
| - DCHECK(worker_message_loop);
|
| - DCHECK(current_message_loop == parent_message_loop_ ||
|
| - current_message_loop == worker_message_loop);
|
| - return worker_message_loop;
|
| -}
|
| -
|
| -buzz::XmppClient* MediatorThreadImpl::xmpp_client() {
|
| - DCHECK_EQ(MessageLoop::current(), worker_message_loop());
|
| - DCHECK(login_.get());
|
| - buzz::XmppClient* xmpp_client = login_->xmpp_client();
|
| - DCHECK(xmpp_client);
|
| - return xmpp_client;
|
| -}
|
| -
|
| } // namespace notifier
|
|
|