[GCM] Extracting GCMConnectionObserver from GCMAppHandler

components/invalidation/gcm_invalidation_bridge.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_INVALIDATION_BRIDGE_H_
 #define COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client.h"
+#include "components/gcm_driver/gcm_connection_observer.h"
 #include "components/invalidation/gcm_network_channel_delegate.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class IdentityProvider;
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace gcm {
 class GCMDriver;
 }  // namespace gcm
 
 namespace invalidation {
 
 // GCMInvalidationBridge and GCMInvalidationBridge::Core implement functions
 // needed for GCMNetworkChannel. GCMInvalidationBridge lives on UI thread while
 // Core lives on IO thread. Core implements GCMNetworkChannelDelegate and posts
 // all function calls to GCMInvalidationBridge which does actual work to perform
 // them.
 class GCMInvalidationBridge : public gcm::GCMAppHandler,
+                              public gcm::GCMConnectionObserver,
                               public OAuth2TokenService::Consumer,
                               public base::NonThreadSafe {
  public:
   class Core;
 
   GCMInvalidationBridge(gcm::GCMDriver* gcm_driver,
                         IdentityProvider* identity_provider);
   virtual ~GCMInvalidationBridge();
 
   // OAuth2TokenService::Consumer implementation.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
   // gcm::GCMAppHandler implementation.
   virtual void ShutdownHandler() OVERRIDE;
   virtual void OnMessage(
       const std::string& app_id,
       const gcm::GCMClient::IncomingMessage& message) OVERRIDE;
   virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
   virtual void OnSendError(
       const std::string& app_id,
       const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
   virtual void OnSendAcknowledged(const std::string& app_id,
                                   const std::string& message_id) OVERRIDE;
+
+  // gcm::GCMConnectionObserver implementation.
   virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;
   virtual void OnDisconnected() OVERRIDE;
 
   scoped_ptr<syncer::GCMNetworkChannelDelegate> CreateDelegate();
 
   void CoreInitializationDone(
       base::WeakPtr<Core> core,
       scoped_refptr<base::SingleThreadTaskRunner> core_thread_task_runner);
 
   // Functions reflecting GCMNetworkChannelDelegate interface. These are called
@@ skipping 25 matching lines @@
   bool subscribed_for_incoming_messages_;
 
   base::WeakPtrFactory<GCMInvalidationBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMInvalidationBridge);
 };
 
 }  // namespace invalidation
 
 #endif  // COMPONENTS_INVALIDATION_GCM_INVALIDATION_BRIDGE_H_