[Sync] Make InvalidationNotifier use PushClient

sync/notifier/chrome_invalidation_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #pragma once
@@ skipping 10 matching lines @@
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/state_writer.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
+namespace notifier {
+class PushClient;
+}  // namespace notifier
+
 namespace sync_notifier {
 
 using invalidation::InvalidationListener;
 
-class CacheInvalidationPacketHandler;
 class RegistrationManager;
 
 // ChromeInvalidationClient is not thread-safe and lives on the sync
 // thread.
 class ChromeInvalidationClient
     : public InvalidationListener,
       public StateWriter {
  public:
   class Listener {
    public:
     virtual ~Listener();
 
     virtual void OnInvalidate(
         const syncable::ModelTypePayloadMap& type_payloads) = 0;
 
     virtual void OnSessionStatusChanged(bool has_session) = 0;
   };
 
-  ChromeInvalidationClient();
+  explicit ChromeInvalidationClient(
+      scoped_ptr<notifier::PushClient> push_client);

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

A scoped_ptr as a constructor parameter looks strange to me.  Would it make more
sense to perform the Pass() before passing the pointer to the constructor?

[akalin, 2012/05/24 00:48:27]

.Pass() still returns a scoped_ptr<> so that wouldn't change anything.

It does look strange, but scoped_ptr<> has been modified to support "moving":
see comments in scoped_ptr.h.

 
   // Calls Stop().
   virtual ~ChromeInvalidationClient();
 
   // Does not take ownership of |listener| or |state_writer|.
   // |invalidation_state_tracker| must be initialized.
-  // |base_task| must still be non-NULL.
   void Start(
       const std::string& client_id, const std::string& client_info,
       const std::string& state,
       const InvalidationVersionMap& initial_max_invalidation_versions,
       const browser_sync::WeakHandle<InvalidationStateTracker>&
           invalidation_state_tracker,
       Listener* listener,
-      StateWriter* state_writer,
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task);
+      StateWriter* state_writer);
 
-  void Stop();
-
-  // Changes the task used to |base_task|, which must still be
-  // non-NULL.  Must only be called between calls to Start() and
-  // Stop().
-  void ChangeBaseTask(base::WeakPtr<buzz::XmppTaskParentInterface> base_task);
+  void UpdateCredentials(const std::string& email, const std::string& token);
 
   // Register the sync types that we're interested in getting
   // notifications for.  May be called at any time.
   void RegisterTypes(syncable::ModelTypeSet types);
 
   virtual void WriteState(const std::string& state) OVERRIDE;
 
   // invalidation::InvalidationListener implementation.
   virtual void Ready(
       invalidation::InvalidationClient* client) OVERRIDE;
@@ skipping 21 matching lines @@
       invalidation::InvalidationClient* client,
       const std::string& prefix,
       int prefix_length) OVERRIDE;
   virtual void InformError(
       invalidation::InvalidationClient* client,
       const invalidation::ErrorInfo& error_info) OVERRIDE;
 
  private:
   friend class ChromeInvalidationClientTest;
 
+  void Stop();
+
   void EmitInvalidation(
       syncable::ModelTypeSet types, const std::string& payload);
 
   base::NonThreadSafe non_thread_safe_;
   ChromeSystemResources chrome_system_resources_;
   InvalidationVersionMap max_invalidation_versions_;
   browser_sync::WeakHandle<InvalidationStateTracker>
       invalidation_state_tracker_;
   Listener* listener_;
   StateWriter* state_writer_;
   scoped_ptr<invalidation::InvalidationClient> invalidation_client_;
-  scoped_ptr<CacheInvalidationPacketHandler>
-      cache_invalidation_packet_handler_;
   scoped_ptr<RegistrationManager> registration_manager_;
   // Stored to pass to |registration_manager_| on start.
   syncable::ModelTypeSet registered_types_;
   bool ticl_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
 };
 
 }  // namespace sync_notifier
 
 #endif  // SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_