Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/gcm_network_channel.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.
 
 #ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
 #define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 75 matching lines @@
  private:
   friend class GCMNetworkChannelTest;
   void Register();
   void OnRegisterComplete(const std::string& registration_id,
                           gcm::GCMClient::Result result);
   void RequestAccessToken();
   void OnGetTokenComplete(const GoogleServiceAuthError& error,
                           const std::string& token);
   void OnIncomingMessage(const std::string& message,
                          const std::string& echo_token);
-  void OnConnectionStateChanged(
-      GCMNetworkChannelDelegate::ConnectionState connection_state);
-
+  void OnConnectionStateChanged(bool online);
+  void UpdateGcmChannelState(bool online);
+  void UpdateHttpChannelState(bool online);
   // Base64 encoding/decoding with URL safe alphabet.
   // http://tools.ietf.org/html/rfc4648#page-7
   static void Base64EncodeURLSafe(const std::string& input,
                                   std::string* output);
   static bool Base64DecodeURLSafe(const std::string& input,
                                   std::string* output);
 
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   scoped_ptr<GCMNetworkChannelDelegate> delegate_;
 
   // Message is saved until all conditions are met: there is valid
   // registration_id and access_token.
   std::string cached_message_;
 
   // Access token is saved because in case of auth failure from server we need
   // to invalidate it.
   std::string access_token_;
 
   // GCM registration_id is requested one at startup and never refreshed until
   // next restart.
   std::string registration_id_;
   scoped_ptr<net::BackoffEntry> register_backoff_entry_;
 
   scoped_ptr<net::URLFetcher> fetcher_;
 
   // cacheinvalidation client receives echo_token with incoming message from
   // GCM and shuld include it in headers with outgoing message over http.
   std::string echo_token_;
 
+  // State of gcm and http channels. GCMNetworkChannel will only report
+  // INVALIDATIONS_ENABLED if both channels are online.
+  bool gcm_channel_online_;
+  bool http_channel_online_;
+
   GCMNetworkChannelDiagnostic diagnostic_info_;
 
   base::WeakPtrFactory<GCMNetworkChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMNetworkChannel);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_