[GCM] Add ConnectionListener support, and hook up to debug page

components/gcm_driver/gcm_client_impl.cc

 // 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.
 
 #include "components/gcm_driver/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 323 matching lines @@
     scoped_ptr<GCMStore::LoadResult> result) {
   std::vector<GURL> endpoints;
   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
   endpoints.push_back(gservices_settings_.GetMCSFallbackEndpoint());
   connection_factory_ = internals_builder_->BuildConnectionFactory(
       endpoints,
       kDefaultBackoffPolicy,
       network_session_,
       net_log_.net_log(),
       &recorder_);
+  connection_factory_->SetConnectionListener(this);
   mcs_client_ = internals_builder_->BuildMCSClient(
       chrome_build_info_.version,
       clock_.get(),
       connection_factory_.get(),
       gcm_store_.get(),
       &recorder_).Pass();
 
   mcs_client_->Initialize(
       base::Bind(&GCMClientImpl::OnMCSError, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&GCMClientImpl::OnMessageReceivedFromMCS,
@@ skipping 350 matching lines @@
 void GCMClientImpl::ClearActivityLogs() {
   recorder_.Clear();
 }
 
 GCMClient::GCMStatistics GCMClientImpl::GetStatistics() const {
   GCMClient::GCMStatistics stats;
   stats.gcm_client_created = true;
   stats.is_recording = recorder_.is_recording();
   stats.gcm_client_state = GetStateString();
   stats.connection_client_created = mcs_client_.get() != NULL;
+  if (connection_factory_.get())
+    stats.connection_state = connection_factory_->GetConnectionStateString();
   if (mcs_client_.get()) {
-    stats.connection_state = mcs_client_->GetStateString();
     stats.send_queue_size = mcs_client_->GetSendQueueSize();
     stats.resend_queue_size = mcs_client_->GetResendQueueSize();
   }
   if (device_checkin_info_.android_id > 0)
     stats.android_id = device_checkin_info_.android_id;
   recorder_.CollectActivities(&stats.recorded_activities);
 
   for (RegistrationInfoMap::const_iterator it = registrations_.begin();
        it != registrations_.end(); ++it) {
     stats.registered_app_ids.push_back(it->first);
   }
   return stats;
 }
 
 void GCMClientImpl::OnActivityRecorded() {
   delegate_->OnActivityRecorded();
 }
 
+void GCMClientImpl::OnConnected(const GURL& current_server,
+                                const net::IPEndPoint& ip_endpoint) {
+  // TODO(zea): inform GCMClient::Delegate and app handlers as well.
+  delegate_->OnActivityRecorded();
+}
+
+void GCMClientImpl::OnDisconnected() {
+  // TODO(zea): inform GCMClient::Delegate and app handlers as well.
+  delegate_->OnActivityRecorded();
+}
+
 void GCMClientImpl::OnMessageReceivedFromMCS(const gcm::MCSMessage& message) {
   switch (message.tag()) {
     case kLoginResponseTag:
       DVLOG(1) << "Login response received by GCM Client. Ignoring.";
       return;
     case kDataMessageStanzaTag:
       DVLOG(1) << "A downstream message received. Processing...";
       HandleIncomingMessage(message);
       return;
     default:
@@ skipping 124 matching lines @@
 
   recorder_.RecordIncomingSendError(
       data_message_stanza.category(),
       data_message_stanza.to(),
       data_message_stanza.id());
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 }  // namespace gcm