Control invalidations network channel from TiclInvalidationService

sync/notifier/sync_invalidation_listener.h

 // Copyright 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_SYNC_INVALIDATION_LISTENER_H_
 #define SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/ack_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidator_state.h"
-#include "sync/notifier/push_client_channel.h"
 #include "sync/notifier/state_writer.h"
 #include "sync/notifier/sync_system_resources.h"
 #include "sync/notifier/unacked_invalidation_set.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
 class PushClient;
@@ skipping 24 matching lines @@
    public:
     virtual ~Delegate();
 
     virtual void OnInvalidate(
         const ObjectIdInvalidationMap& invalidations) = 0;
 
     virtual void OnInvalidatorStateChange(InvalidatorState state) = 0;
   };
 
   explicit SyncInvalidationListener(
-      scoped_ptr<notifier::PushClient> push_client);
+      scoped_ptr<SyncNetworkChannel> network_channel);
 
   // Calls Stop().
   virtual ~SyncInvalidationListener();
 
   // Does not take ownership of |delegate| or |state_writer|.
   // |invalidation_state_tracker| must be initialized.
   void Start(
       const CreateInvalidationClientCallback&
           create_invalidation_client_callback,
       const std::string& client_id, const std::string& client_info,
@@ skipping 79 matching lines @@
   // This call isn't synchronous so we can't guarantee these invalidations will
   // be safely on disk by the end of the call, but it should ensure that the
   // data makes it to disk eventually.
   void SaveInvalidations(const ObjectIdInvalidationMap& to_save);
 
   // Emits previously saved invalidations to their registered observers.
   void EmitSavedInvalidations(const ObjectIdInvalidationMap& to_emit);
 
   WeakHandle<AckHandler> GetThisAsAckHandler();
 
-  PushClientChannel push_client_channel_;
+  scoped_ptr<SyncNetworkChannel> sync_network_channel_;
   SyncSystemResources sync_system_resources_;
   UnackedInvalidationsMap unacked_invalidations_map_;
   WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
   Delegate* delegate_;
   scoped_ptr<invalidation::InvalidationClient> invalidation_client_;
   scoped_ptr<RegistrationManager> registration_manager_;
   // Stored to pass to |registration_manager_| on start.
   ObjectIdSet registered_ids_;
 
   // The states of the ticl and the push client.
   InvalidatorState ticl_state_;
   InvalidatorState push_client_state_;
 
   base::WeakPtrFactory<SyncInvalidationListener> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncInvalidationListener);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_