Client-to-server messages in GCMNetworkChannel

sync/notifier/sync_system_resources.cc

 // 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.
 
 #include "sync/notifier/sync_system_resources.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "google/cacheinvalidation/client_gateway.pb.h"
 #include "google/cacheinvalidation/deps/callback.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "sync/notifier/gcm_network_channel.h"
+#include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/push_client_channel.h"
 
 namespace syncer {
 
 SyncLogger::SyncLogger() {}
 SyncLogger::~SyncLogger() {}
 
 void SyncLogger::Log(LogLevel level, const char* file, int line,
                      const char* format, ...) {
@@ skipping 140 matching lines @@
 }
 
 scoped_ptr<SyncNetworkChannel> SyncNetworkChannel::CreatePushClientChannel(
     const notifier::NotifierOptions& notifier_options) {
   scoped_ptr<notifier::PushClient> push_client(
       notifier::PushClient::CreateDefaultOnIOThread(notifier_options));
   return scoped_ptr<SyncNetworkChannel>(
       new PushClientChannel(push_client.Pass()));
 }
 
-scoped_ptr<SyncNetworkChannel> SyncNetworkChannel::CreateGCMNetworkChannel() {
-  return scoped_ptr<SyncNetworkChannel>(new GCMNetworkChannel());
+scoped_ptr<SyncNetworkChannel> SyncNetworkChannel::CreateGCMNetworkChannel(
+    scoped_refptr<net::URLRequestContextGetter> request_context_getter,
+    scoped_ptr<GCMNetworkChannelDelegate> delegate) {
+  return scoped_ptr<SyncNetworkChannel>(new GCMNetworkChannel(
+      request_context_getter, delegate.Pass()));
 }
 
 const std::string& SyncNetworkChannel::GetServiceContextForTest() const {
   return service_context_;
 }
 
 int64 SyncNetworkChannel::GetSchedulingHashForTest() const {
   return scheduling_hash_;
 }
 
 std::string SyncNetworkChannel::EncodeMessageForTest(
     const std::string& message, const std::string& service_context,
     int64 scheduling_hash) {
   std::string encoded_message;
   EncodeMessage(&encoded_message, message, service_context, scheduling_hash);
   return encoded_message;
 }
 
 bool SyncNetworkChannel::DecodeMessageForTest(
     const std::string& data,
     std::string* message,
     std::string* service_context,
     int64* scheduling_hash) {
   return DecodeMessage(data, message, service_context, scheduling_hash);
 }
 
-void SyncNetworkChannel::NotifyStateChange(InvalidatorState invalidator_state) {
-  // Remember state for future NetworkStatusReceivers.
+void SyncNetworkChannel::SetNetworkState(InvalidatorState invalidator_state) {
+  if (invalidator_state_ == invalidator_state)
+    return;
   invalidator_state_ = invalidator_state;
   // Notify NetworkStatusReceivers in cacheinvalidation.
   for (NetworkStatusReceiverList::const_iterator it =
            network_status_receivers_.begin();
        it != network_status_receivers_.end(); ++it) {
     (*it)->Run(invalidator_state_ == INVALIDATIONS_ENABLED);
   }
   // Notify observers.
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnNetworkChannelStateChanged(invalidator_state_));
@@ skipping 167 matching lines @@
 
 SyncInvalidationScheduler* SyncSystemResources::internal_scheduler() {
   return internal_scheduler_.get();
 }
 
 SyncInvalidationScheduler* SyncSystemResources::listener_scheduler() {
   return listener_scheduler_.get();
 }
 
 }  // namespace syncer