[Sync] Make InvalidationNotifier use PushClient

sync/notifier/invalidation_notifier.h

Index: sync/notifier/invalidation_notifier.h
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index a287a6f90f2831d57aa230f295baf3c2b7324a6b..1771ab77a8852d48dedbbe2191d1672ac0e7a216 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -20,8 +20,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
-#include "jingle/notifier/base/notifier_options.h"
-#include "jingle/notifier/communicator/login.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/state_writer.h"
@@ -29,18 +27,21 @@
 #include "sync/syncable/model_type.h"
 #include "sync/util/weak_handle.h"
 
+namespace notifier {
+class PushClient;
+}  // namespace notifier
+
 namespace sync_notifier {
 
 // This class must live on the IO thread.
 class InvalidationNotifier
     : public SyncNotifier,
-      public notifier::LoginDelegate,
       public ChromeInvalidationClient::Listener,
       public StateWriter {
  public:
   // |invalidation_state_tracker| must be initialized.
   InvalidationNotifier(
-      const notifier::NotifierOptions& notifier_options,
+      scoped_ptr<notifier::PushClient> push_client,

[rlarocque, 2012/05/24 00:44:49]

Same concern as before.  I'm not sure it makes sense to pass scoped_ptrs to a
constructor, since passing pointers to a constructor normally implies a transfer
of ownership.

       const InvalidationVersionMap& initial_max_invalidation_versions,
       const browser_sync::WeakHandle<InvalidationStateTracker>&
           invalidation_state_tracker,
@@ -60,11 +61,6 @@ class InvalidationNotifier
   virtual void SendNotification(
       syncable::ModelTypeSet changed_types) OVERRIDE;
 
-  // notifier::LoginDelegate implementation.
-  virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE;
-  virtual void OnDisconnect() OVERRIDE;
-
   // ChromeInvalidationClient::Listener implementation.
   virtual void OnInvalidate(
       const syncable::ModelTypePayloadMap& type_payloads) OVERRIDE;
@@ -87,9 +83,6 @@ class InvalidationNotifier
   };
   State state_;
 
-  // Used to build parameters for |login_|.
-  const notifier::NotifierOptions notifier_options_;
-
   // Passed to |invalidation_client_|.
   const InvalidationVersionMap initial_max_invalidation_versions_;
 
@@ -109,10 +102,6 @@ class InvalidationNotifier
   // The state to pass to |chrome_invalidation_client_|.
   std::string invalidation_state_;
 
-  // The XMPP connection manager.
-  // TODO(akalin): Use PushClient instead.
-  scoped_ptr<notifier::Login> login_;
-
   // The invalidation client.
   ChromeInvalidationClient invalidation_client_;