Revert 50550 - Implemented initial version of server-issued notification client.

Added NOTIFICATION_SERVER notification method (use
--sync-notification-method=server to turn on).

BUG=34647
TEST=manually

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=50479

Review URL: http://codereview.chromium.org/2827014

TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/2860015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50557 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 29 deletions

diff --git a/chrome/common/net/notifier/listener/mediator_thread_impl.cc b/chrome/common/net/notifier/listener/mediator_thread_impl.cc
index 76c270e7..d15e2c8 100644
--- a/chrome/common/net/notifier/listener/mediator_thread_impl.cc
+++ b/chrome/common/net/notifier/listener/mediator_thread_impl.cc
@@ -144,24 +144,6 @@ 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());
@@ -377,4 +359,22 @@ 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
diff --git a/chrome/common/net/notifier/listener/mediator_thread_impl.h b/chrome/common/net/notifier/listener/mediator_thread_impl.h
index fb14d5b..30683e8 100644
--- a/chrome/common/net/notifier/listener/mediator_thread_impl.h
+++ b/chrome/common/net/notifier/listener/mediator_thread_impl.h
@@ -83,17 +83,6 @@ class MediatorThreadImpl
       const std::vector<std::string>& subscribed_services_list);
   virtual void SendNotification(const OutgoingNotificationData& data);
 
- protected:
-  // Should only be called after Start().
-  MessageLoop* worker_message_loop();
-
-  // Should only be called after OnConnectionStateChange() is called
-  // on the delegate with true.
-  buzz::XmppClient* xmpp_client();
-
-  Delegate* delegate_;
-  MessageLoop* parent_message_loop_;
-
  private:
   void StartLibjingleThread();
   void PumpLibjingleLoop();
@@ -128,6 +117,11 @@ class MediatorThreadImpl
   void OnSubscriptionStateChangeOnParentThread(
       bool success);
 
+  MessageLoop* worker_message_loop();
+  buzz::XmppClient* xmpp_client();
+
+  Delegate* delegate_;
+  MessageLoop* parent_message_loop_;
   chrome_common_net::NetworkChangeNotifierThread*
       network_change_notifier_thread_;
   base::Thread worker_thread_;