Client-to-server messages in GCMNetworkChannel

sync/notifier/sync_system_resources.h

Index: sync/notifier/sync_system_resources.h
diff --git a/sync/notifier/sync_system_resources.h b/sync/notifier/sync_system_resources.h
index 22fcb96c2cf15f7d5108c21cea31875654f68f06..14627c2487f2be9d66622b46be34ae9479eff0c9 100644
--- a/sync/notifier/sync_system_resources.h
+++ b/sync/notifier/sync_system_resources.h
@@ -26,6 +26,8 @@
 
 namespace syncer {
 
+class GCMNetworkChannelDelegate;
+
 class SyncLogger : public invalidation::Logger {
  public:
   SyncLogger();
@@ -123,7 +125,9 @@ class SYNC_EXPORT_PRIVATE SyncNetworkChannel
   // specific parameters.
   static scoped_ptr<SyncNetworkChannel> CreatePushClientChannel(
       const notifier::NotifierOptions& notifier_options);
-  static scoped_ptr<SyncNetworkChannel> CreateGCMNetworkChannel();
+  static scoped_ptr<SyncNetworkChannel> CreateGCMNetworkChannel(
+      scoped_refptr<net::URLRequestContextGetter> request_context_getter,
+      scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
   const std::string& GetServiceContextForTest() const;
 
@@ -141,8 +145,8 @@ class SYNC_EXPORT_PRIVATE SyncNetworkChannel
       int64* scheduling_hash);
 
  protected:
-  // Subclass should notify about connection state through NotifyStateChange.
-  void NotifyStateChange(InvalidatorState invalidator_state);
+  // Subclass should notify about connection state through SetNetworkState.
+  void SetNetworkState(InvalidatorState invalidator_state);

[rlarocque, 2014/01/16 18:52:48]

Is this change related to your efforts to make state changes be handled
differently for GCM and XMPP channels?

Looking at the code as it currently exists, I think that NotifyStateChange() is
the better name.  Were you planning to make other changes that would make this
name a bad description?

[pavely, 2014/01/17 00:44:39]

One scenario that I considered was to use this function to report network state
after each operation. This way there would be lots of calls for no state change.
In this function implementation I only notify state change if state actually
changed.
I ended up reverting change that uses this and I'm not sure I'll need this
behavior in the future so I'll revert function name and implementation change as
well.

On 2014/01/16 18:52:48, rlarocque wrote:

   // Subclass should call DeliverIncomingMessage for message to reach
   // invalidations library.
   void DeliverIncomingMessage(const std::string& message);