Componentize the GCM info collection for gcm-internals.

components/gcm_driver/gcm_internals_helper.cc

Index: components/gcm_driver/gcm_internals_helper.cc
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/components/gcm_driver/gcm_internals_helper.cc
similarity index 22%
copy from chrome/browser/ui/webui/gcm_internals_ui.cc
copy to components/gcm_driver/gcm_internals_helper.cc
index 79e45e840bd56ec4a32cd2e654111e9f0d2d1eed..c66d3d7e7d7c6d83b35ed3e6aaedac73570fbe3c 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.cc
+++ b/components/gcm_driver/gcm_internals_helper.cc
@@ -1,313 +1,150 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 "chrome/browser/ui/webui/gcm_internals_ui.h"
+#include "components/gcm_driver/gcm_internals_helper.h"
 
-#include <vector>
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/format_macros.h"
-#include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
-#include "chrome/common/url_constants.h"
-#include "components/gcm_driver/gcm_client.h"
-#include "components/gcm_driver/gcm_driver.h"
+#include "components/gcm_driver/gcm_activity.h"
 #include "components/gcm_driver/gcm_internals_constants.h"
 #include "components/gcm_driver/gcm_profile_service.h"
-#include "content/public/browser/web_ui.h"
-#include "content/public/browser/web_ui_controller.h"
-#include "content/public/browser/web_ui_data_source.h"
-#include "content/public/browser/web_ui_message_handler.h"
-#include "grit/components_resources.h"
+
+namespace gcm_driver {
 
 namespace {
 
-void SetCheckinInfo(
-    const std::vector<gcm::CheckinActivity>& checkins,
-    base::ListValue* checkin_info) {
-  std::vector<gcm::CheckinActivity>::const_iterator it = checkins.begin();
-  for (; it < checkins.end(); ++it) {
-    base::ListValue* row = new base::ListValue();
+void SetCheckinInfo(const std::vector<gcm::CheckinActivity>& checkins,
+                    base::ListValue* checkin_info) {
+  for (const gcm::CheckinActivity& checkin : checkins) {
+        base::ListValue* row = new base::ListValue();
     checkin_info->Append(row);
 
-    row->AppendDouble(it->time.ToJsTime());
-    row->AppendString(it->event);
-    row->AppendString(it->details);
+    row->AppendDouble(checkin.time.ToJsTime());
+    row->AppendString(checkin.event);
+    row->AppendString(checkin.details);
   }
 }
 
-void SetConnectionInfo(
-    const std::vector<gcm::ConnectionActivity>& connections,
-    base::ListValue* connection_info) {
-  std::vector<gcm::ConnectionActivity>::const_iterator it = connections.begin();
-  for (; it < connections.end(); ++it) {
+void SetConnectionInfo(const std::vector<gcm::ConnectionActivity>& connections,
+                       base::ListValue* connection_info) {
+  for (const gcm::ConnectionActivity& connection : connections) {
     base::ListValue* row = new base::ListValue();
     connection_info->Append(row);
 
-    row->AppendDouble(it->time.ToJsTime());
-    row->AppendString(it->event);
-    row->AppendString(it->details);
+    row->AppendDouble(connection.time.ToJsTime());
+    row->AppendString(connection.event);
+    row->AppendString(connection.details);
   }
 }
 
 void SetRegistrationInfo(
     const std::vector<gcm::RegistrationActivity>& registrations,
     base::ListValue* registration_info) {
-  std::vector<gcm::RegistrationActivity>::const_iterator it =
-      registrations.begin();
-  for (; it < registrations.end(); ++it) {
+  for (const gcm::RegistrationActivity& registration : registrations) {
     base::ListValue* row = new base::ListValue();
     registration_info->Append(row);
 
-    row->AppendDouble(it->time.ToJsTime());
-    row->AppendString(it->app_id);
-    row->AppendString(it->source);
-    row->AppendString(it->event);
-    row->AppendString(it->details);
+    row->AppendDouble(registration.time.ToJsTime());
+    row->AppendString(registration.app_id);
+    row->AppendString(registration.source);
+    row->AppendString(registration.event);
+    row->AppendString(registration.details);
   }
 }
 
-void SetReceivingInfo(
-    const std::vector<gcm::ReceivingActivity>& receives,
-    base::ListValue* receive_info) {
-  std::vector<gcm::ReceivingActivity>::const_iterator it = receives.begin();
-  for (; it < receives.end(); ++it) {
+void SetReceivingInfo(const std::vector<gcm::ReceivingActivity>& receives,
+                      base::ListValue* receive_info) {
+  for (const gcm::ReceivingActivity& receive : receives) {
     base::ListValue* row = new base::ListValue();
     receive_info->Append(row);
 
-    row->AppendDouble(it->time.ToJsTime());
-    row->AppendString(it->app_id);
-    row->AppendString(it->from);
-    row->AppendString(base::IntToString(it->message_byte_size));
-    row->AppendString(it->event);
-    row->AppendString(it->details);
+    row->AppendDouble(receive.time.ToJsTime());
+    row->AppendString(receive.app_id);
+    row->AppendString(receive.from);
+    row->AppendString(base::IntToString(receive.message_byte_size));
+    row->AppendString(receive.event);
+    row->AppendString(receive.details);
   }
 }
 
-void SetSendingInfo(
-    const std::vector<gcm::SendingActivity>& sends,
-    base::ListValue* send_info) {
-  std::vector<gcm::SendingActivity>::const_iterator it = sends.begin();
-  for (; it < sends.end(); ++it) {
+void SetSendingInfo(const std::vector<gcm::SendingActivity>& sends,
+                    base::ListValue* send_info) {
+  for (const gcm::SendingActivity& send : sends) {
     base::ListValue* row = new base::ListValue();
     send_info->Append(row);
 
-    row->AppendDouble(it->time.ToJsTime());
-    row->AppendString(it->app_id);
-    row->AppendString(it->receiver_id);
-    row->AppendString(it->message_id);
-    row->AppendString(it->event);
-    row->AppendString(it->details);
+    row->AppendDouble(send.time.ToJsTime());
+    row->AppendString(send.app_id);
+    row->AppendString(send.receiver_id);
+    row->AppendString(send.message_id);
+    row->AppendString(send.event);
+    row->AppendString(send.details);
   }
 }
 
-// Class acting as a controller of the chrome://gcm-internals WebUI.
-class GcmInternalsUIMessageHandler : public content::WebUIMessageHandler {
- public:
-  GcmInternalsUIMessageHandler();
-  ~GcmInternalsUIMessageHandler() override;
-
-  // WebUIMessageHandler implementation.
-  void RegisterMessages() override;
-
- private:
-  // Return all of the GCM related infos to the gcm-internals page by calling
-  // Javascript callback function
-  // |gcm-internals.returnInfo()|.
-  void ReturnResults(Profile* profile, gcm::GCMProfileService* profile_service,
-                     const gcm::GCMClient::GCMStatistics* stats) const;
-
-  // Request all of the GCM related infos through gcm profile service.
-  void RequestAllInfo(const base::ListValue* args);
-
-  // Enables/disables GCM activity recording through gcm profile service.
-  void SetRecording(const base::ListValue* args);
-
-  // Callback function of the request for all gcm related infos.
-  void RequestGCMStatisticsFinished(
-      const gcm::GCMClient::GCMStatistics& args) const;
-
-  // Factory for creating references in callbacks.
-  base::WeakPtrFactory<GcmInternalsUIMessageHandler> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(GcmInternalsUIMessageHandler);
-};
-
-GcmInternalsUIMessageHandler::GcmInternalsUIMessageHandler()
-    : weak_ptr_factory_(this) {}
-
-GcmInternalsUIMessageHandler::~GcmInternalsUIMessageHandler() {}
+}  // namespace
 
-void GcmInternalsUIMessageHandler::ReturnResults(
-    Profile* profile,
-    gcm::GCMProfileService* profile_service,
-    const gcm::GCMClient::GCMStatistics* stats) const {
-  base::DictionaryValue results;
+void SetGCMInternalsInfo(const gcm::GCMClient::GCMStatistics* stats,
+                         gcm::GCMProfileService* profile_service,
+                         PrefService* prefs,
+                         base::DictionaryValue* results) {
   base::DictionaryValue* device_info = new base::DictionaryValue();
-  results.Set(gcm_driver::kDeviceInfo, device_info);
+  results->Set(kDeviceInfo, device_info);
 
-  device_info->SetBoolean(gcm_driver::kProfileServiceCreated,
-                          profile_service != NULL);
-  device_info->SetBoolean(
-      gcm_driver::kGcmEnabled,
-      gcm::GCMProfileService::IsGCMEnabled(profile->GetPrefs()));
+  device_info->SetBoolean(kProfileServiceCreated, profile_service != NULL);
+  device_info->SetBoolean(kGcmEnabled,
+                          gcm::GCMProfileService::IsGCMEnabled(prefs));
   if (stats) {
-    results.SetBoolean(gcm_driver::kIsRecording, stats->is_recording);
-    device_info->SetBoolean(gcm_driver::kGcmClientCreated,
-                            stats->gcm_client_created);
-    device_info->SetString(gcm_driver::kGcmClientState,
-                           stats->gcm_client_state);
-    device_info->SetBoolean(gcm_driver::kConnectionClientCreated,
+    results->SetBoolean(kIsRecording, stats->is_recording);
+    device_info->SetBoolean(kGcmClientCreated, stats->gcm_client_created);
+    device_info->SetString(kGcmClientState, stats->gcm_client_state);
+    device_info->SetBoolean(kConnectionClientCreated,
                             stats->connection_client_created);
-    device_info->SetString(gcm_driver::kRegisteredAppIds,
+    device_info->SetString(kRegisteredAppIds,
                            base::JoinString(stats->registered_app_ids, ","));
     if (stats->connection_client_created)
-      device_info->SetString(gcm_driver::kConnectionState,
-                             stats->connection_state);
+      device_info->SetString(kConnectionState, stats->connection_state);
     if (stats->android_id > 0) {
       device_info->SetString(
-          gcm_driver::kAndroidId,
-          base::StringPrintf("0x%" PRIx64, stats->android_id));
+          kAndroidId, base::StringPrintf("0x%" PRIx64, stats->android_id));
     }
-    device_info->SetInteger(gcm_driver::kSendQueueSize, stats->send_queue_size);
-    device_info->SetInteger(gcm_driver::kResendQueueSize,
-                            stats->resend_queue_size);
+    device_info->SetInteger(kSendQueueSize, stats->send_queue_size);
+    device_info->SetInteger(kResendQueueSize, stats->resend_queue_size);
 
     if (stats->recorded_activities.checkin_activities.size() > 0) {
       base::ListValue* checkin_info = new base::ListValue();
-      results.Set(gcm_driver::kCheckinInfo, checkin_info);
+      results->Set(kCheckinInfo, checkin_info);
       SetCheckinInfo(stats->recorded_activities.checkin_activities,
                      checkin_info);
     }
     if (stats->recorded_activities.connection_activities.size() > 0) {
       base::ListValue* connection_info = new base::ListValue();
-      results.Set(gcm_driver::kConnectionInfo, connection_info);
+      results->Set(kConnectionInfo, connection_info);
       SetConnectionInfo(stats->recorded_activities.connection_activities,
                         connection_info);
     }
     if (stats->recorded_activities.registration_activities.size() > 0) {
       base::ListValue* registration_info = new base::ListValue();
-      results.Set(gcm_driver::kRegistrationInfo, registration_info);
+      results->Set(kRegistrationInfo, registration_info);
       SetRegistrationInfo(stats->recorded_activities.registration_activities,
                           registration_info);
     }
     if (stats->recorded_activities.receiving_activities.size() > 0) {
       base::ListValue* receive_info = new base::ListValue();
-      results.Set(gcm_driver::kReceiveInfo, receive_info);
+      results->Set(kReceiveInfo, receive_info);
       SetReceivingInfo(stats->recorded_activities.receiving_activities,
                        receive_info);
     }
     if (stats->recorded_activities.sending_activities.size() > 0) {
       base::ListValue* send_info = new base::ListValue();
-      results.Set(gcm_driver::kSendInfo, send_info);
+      results->Set(kSendInfo, send_info);
       SetSendingInfo(stats->recorded_activities.sending_activities, send_info);
     }
   }
-  web_ui()->CallJavascriptFunction(gcm_driver::kSetGcmInternalsInfo, results);
-}
-
-void GcmInternalsUIMessageHandler::RequestAllInfo(
-    const base::ListValue* args) {
-  if (args->GetSize() != 1) {
-    NOTREACHED();
-    return;
-  }
-  bool clear_logs = false;
-  if (!args->GetBoolean(0, &clear_logs)) {
-    NOTREACHED();
-    return;
-  }
-
-  Profile* profile = Profile::FromWebUI(web_ui());
-  gcm::GCMProfileService* profile_service =
-    gcm::GCMProfileServiceFactory::GetForProfile(profile);
-
-  if (!profile_service || !profile_service->driver()) {
-    ReturnResults(profile, NULL, NULL);
-  } else {
-    profile_service->driver()->GetGCMStatistics(
-        base::Bind(&GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished,
-                   weak_ptr_factory_.GetWeakPtr()),
-        clear_logs);
-  }
-}
-
-void GcmInternalsUIMessageHandler::SetRecording(const base::ListValue* args) {
-  if (args->GetSize() != 1) {
-    NOTREACHED();
-    return;
-  }
-  bool recording = false;
-  if (!args->GetBoolean(0, &recording)) {
-    NOTREACHED();
-    return;
-  }
-
-  Profile* profile = Profile::FromWebUI(web_ui());
-  gcm::GCMProfileService* profile_service =
-      gcm::GCMProfileServiceFactory::GetForProfile(profile);
-
-  if (!profile_service) {
-    ReturnResults(profile, NULL, NULL);
-    return;
-  }
-  // Get fresh stats after changing recording setting.
-  profile_service->driver()->SetGCMRecording(
-      base::Bind(
-          &GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished,
-          weak_ptr_factory_.GetWeakPtr()),
-      recording);
-}
-
-void GcmInternalsUIMessageHandler::RequestGCMStatisticsFinished(
-    const gcm::GCMClient::GCMStatistics& stats) const {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  DCHECK(profile);
-  gcm::GCMProfileService* profile_service =
-      gcm::GCMProfileServiceFactory::GetForProfile(profile);
-  DCHECK(profile_service);
-  ReturnResults(profile, profile_service, &stats);
-}
-
-void GcmInternalsUIMessageHandler::RegisterMessages() {
-  web_ui()->RegisterMessageCallback(
-      gcm_driver::kGetGcmInternalsInfo,
-      base::Bind(&GcmInternalsUIMessageHandler::RequestAllInfo,
-                 weak_ptr_factory_.GetWeakPtr()));
-  web_ui()->RegisterMessageCallback(
-      gcm_driver::kSetGcmInternalsRecording,
-      base::Bind(&GcmInternalsUIMessageHandler::SetRecording,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-}  // namespace
-
-GCMInternalsUI::GCMInternalsUI(content::WebUI* web_ui)
-    : content::WebUIController(web_ui) {
-  // Set up the chrome://gcm-internals source.
-  content::WebUIDataSource* html_source =
-      content::WebUIDataSource::Create(chrome::kChromeUIGCMInternalsHost);
-
-  html_source->SetJsonPath("strings.js");
-
-  // Add required resources.
-  html_source->AddResourcePath(gcm_driver::kGcmInternalsCSS,
-                               IDR_GCM_DRIVER_GCM_INTERNALS_CSS);
-  html_source->AddResourcePath(gcm_driver::kGcmInternalsJS,
-                               IDR_GCM_DRIVER_GCM_INTERNALS_JS);
-  html_source->SetDefaultResource(IDR_GCM_DRIVER_GCM_INTERNALS_HTML);
-
-  Profile* profile = Profile::FromWebUI(web_ui);
-  content::WebUIDataSource::Add(profile, html_source);
-
-  web_ui->AddMessageHandler(new GcmInternalsUIMessageHandler());
 }
 
-GCMInternalsUI::~GCMInternalsUI() {}
+}  // namespace gcm_driver