[Sync] Make InvalidationNotifier use PushClient

sync/notifier/chrome_system_resources.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.
 //
 // Simple system resources class that uses the current message loop
 // for scheduling.  Assumes the current message loop is already
 // running.
 
 #ifndef SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
 #define SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "google/cacheinvalidation/include/system-resources.h"
+#include "sync/notifier/push_client_channel.h"
 #include "sync/notifier/state_writer.h"
 
+namespace notifier {
+class PushClient;
+}  // namespace notifier
+
 namespace sync_notifier {
 
-class CacheInvalidationPacketHandler;
-
 class ChromeLogger : public invalidation::Logger {
  public:
   ChromeLogger();
 
   virtual ~ChromeLogger();
 
   // invalidation::Logger implementation.
   virtual void Log(LogLevel level, const char* file, int line,
                    const char* format, ...) OVERRIDE;
 
@@ skipping 68 matching lines @@
 
   // Runs the given callback with the given value and deletes it.
   void RunAndDeleteReadKeyCallback(
       invalidation::ReadKeyCallback* callback, const std::string& value);
 
   StateWriter* state_writer_;
   invalidation::Scheduler* scheduler_;
   std::string cached_state_;
 };
 
-class ChromeNetwork : public invalidation::NetworkChannel {
- public:
-  ChromeNetwork();
-
-  virtual ~ChromeNetwork();
-
-  void UpdatePacketHandler(CacheInvalidationPacketHandler* packet_handler);
-
-  // invalidation::NetworkChannel implementation.
-  virtual void SendMessage(const std::string& outgoing_message) OVERRIDE;
-
-  virtual void SetMessageReceiver(
-      invalidation::MessageCallback* incoming_receiver) OVERRIDE;
-
-  virtual void AddNetworkStatusReceiver(
-      invalidation::NetworkStatusCallback* network_status_receiver) OVERRIDE;
-
-  virtual void SetSystemResources(
-      invalidation::SystemResources* resources) OVERRIDE;
-
- private:
-  void HandleInboundMessage(const std::string& incoming_message);
-
-  CacheInvalidationPacketHandler* packet_handler_;
-  scoped_ptr<invalidation::MessageCallback> incoming_receiver_;
-  std::vector<invalidation::NetworkStatusCallback*> network_status_receivers_;
-  base::WeakPtrFactory<ChromeNetwork> weak_factory_;
-};
-
 class ChromeSystemResources : public invalidation::SystemResources {
  public:
-  explicit ChromeSystemResources(StateWriter* state_writer);
+  ChromeSystemResources(scoped_ptr<notifier::PushClient> push_client,
+                        StateWriter* state_writer);
 
   virtual ~ChromeSystemResources();
 
   // invalidation::SystemResources implementation.
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual bool IsStarted() const OVERRIDE;
   virtual void set_platform(const std::string& platform);
   virtual std::string platform() const OVERRIDE;
   virtual ChromeLogger* logger() OVERRIDE;
   virtual ChromeStorage* storage() OVERRIDE;
-  virtual ChromeNetwork* network() OVERRIDE;
+  virtual PushClientChannel* network() OVERRIDE;
   virtual ChromeScheduler* internal_scheduler() OVERRIDE;
   virtual ChromeScheduler* listener_scheduler() OVERRIDE;
 
  private:
   bool is_started_;
   std::string platform_;
   scoped_ptr<ChromeLogger> logger_;
   scoped_ptr<ChromeScheduler> internal_scheduler_;
   scoped_ptr<ChromeScheduler> listener_scheduler_;
   scoped_ptr<ChromeStorage> storage_;
-  scoped_ptr<ChromeNetwork> network_;
+  PushClientChannel push_client_channel_;
 };
 
 }  // namespace sync_notifier
 
 #endif  // SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_