Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/sync_system_resources.h

 // Copyright 2014 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 COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
 #define COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
@@ skipping 125 matching lines @@
   static scoped_ptr<SyncNetworkChannel> CreatePushClientChannel(
       const notifier::NotifierOptions& notifier_options);
   static scoped_ptr<SyncNetworkChannel> CreateGCMNetworkChannel(
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       scoped_ptr<GCMNetworkChannelDelegate> delegate);
 
   // Get the count of how many valid received messages were received.
   int GetReceivedMessagesCount() const;
 
  protected:
-  // Subclass should notify about connection state through NotifyStateChange.
-  void NotifyStateChange(InvalidatorState invalidator_state);
+  // Subclass should call NotifyNetworkStatusChange to notify about network
+  // changes. This triggers cacheinvalidation to try resending failed message
+  // ahead of schedule when client comes online or IP address changes.
+  void NotifyNetworkStatusChange(bool online);

[rlarocque, 2014/06/19 16:13:33]

nit: Could you add some spacing between these methods?  It's hard to tell
without syntax highlighting where the comments stop and the next function
begins.

[pavely, 2014/06/19 17:29:15]

Done.

+  // Subclass should notify about connection state through
+  // NotifyChannelStateChange. If communication doesn't work and it is possible
+  // that invalidations from server will not reach this client then channel
+  // should call this function with TRANSIENT_INVALIDATION_ERROR.
+  void NotifyChannelStateChange(InvalidatorState invalidator_state);
   // Subclass should call DeliverIncomingMessage for message to reach
   // invalidations library.
   bool DeliverIncomingMessage(const std::string& message);
 
  private:
   typedef std::vector<invalidation::NetworkStatusCallback*>
       NetworkStatusReceiverList;
 
   // Callbacks into invalidation library
   scoped_ptr<invalidation::MessageCallback> incoming_receiver_;
   NetworkStatusReceiverList network_status_receivers_;
 
-  // Last channel state for new network status receivers.
-  InvalidatorState invalidator_state_;
+  // Last network status for new network status receivers.
+  bool last_network_status_;
 
   int received_messages_count_;
 
   ObserverList<Observer> observers_;
 };
 
 class SyncStorage : public invalidation::Storage {
  public:
   SyncStorage(StateWriter* state_writer, invalidation::Scheduler* scheduler);
 
@@ skipping 60 matching lines @@
   scoped_ptr<SyncInvalidationScheduler> internal_scheduler_;
   scoped_ptr<SyncInvalidationScheduler> listener_scheduler_;
   scoped_ptr<SyncStorage> storage_;
   // sync_network_channel_ is owned by SyncInvalidationListener.
   SyncNetworkChannel* sync_network_channel_;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_