Move all gcm activity types out of GCMStatsRecorder

chrome/browser/ui/webui/gcm_internals_ui.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 "chrome/browser/ui/webui/gcm_internals_ui.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 10 matching lines @@
 #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 "google_apis/gcm/gcm_client.h"
 #include "grit/browser_resources.h"
 
 namespace {
 
 void SetCheckinInfo(
-    const std::vector<gcm::GCMStatsRecorder::CheckinActivity>& checkins,
+    const std::vector<gcm::CheckinActivity>& checkins,
     base::ListValue* checkin_info) {
-  std::vector<gcm::GCMStatsRecorder::CheckinActivity>::const_iterator it =
-      checkins.begin();
+  std::vector<gcm::CheckinActivity>::const_iterator it = checkins.begin();
   for (; it < checkins.end(); ++it) {
     base::ListValue* row = new base::ListValue();
     checkin_info->Append(row);
 
     row->AppendDouble(it->time.ToJsTime());
     row->AppendString(it->event);
     row->AppendString(it->details);
   }
 }
 
 void SetConnectionInfo(
-    const std::vector<gcm::GCMStatsRecorder::ConnectionActivity>& connections,
+    const std::vector<gcm::ConnectionActivity>& connections,
     base::ListValue* connection_info) {
-  std::vector<gcm::GCMStatsRecorder::ConnectionActivity>::const_iterator it =
-      connections.begin();
+  std::vector<gcm::ConnectionActivity>::const_iterator it = connections.begin();
   for (; it < connections.end(); ++it) {
     base::ListValue* row = new base::ListValue();
     connection_info->Append(row);
 
     row->AppendDouble(it->time.ToJsTime());
     row->AppendString(it->event);
     row->AppendString(it->details);
   }
 }
 
 void SetRegistrationInfo(
-    const std::vector<gcm::GCMStatsRecorder::RegistrationActivity>&
-        registrations,
+    const std::vector<gcm::RegistrationActivity>& registrations,
     base::ListValue* registration_info) {
-  std::vector<gcm::GCMStatsRecorder::RegistrationActivity>::const_iterator it =
+  std::vector<gcm::RegistrationActivity>::const_iterator it =
       registrations.begin();
   for (; it < registrations.end(); ++it) {
     base::ListValue* row = new base::ListValue();
     registration_info->Append(row);
 
     row->AppendDouble(it->time.ToJsTime());
     row->AppendString(it->app_id);
     row->AppendString(it->sender_ids);
     row->AppendString(it->event);
     row->AppendString(it->details);
   }
 }
 
 void SetReceivingInfo(
-    const std::vector<gcm::GCMStatsRecorder::ReceivingActivity>& receives,
+    const std::vector<gcm::ReceivingActivity>& receives,
     base::ListValue* receive_info) {
-  std::vector<gcm::GCMStatsRecorder::ReceivingActivity>::const_iterator it =
-      receives.begin();
+  std::vector<gcm::ReceivingActivity>::const_iterator it = receives.begin();
   for (; it < receives.end(); ++it) {
     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::StringPrintf("%d", it->message_byte_size));
     row->AppendString(it->event);
     row->AppendString(it->details);
   }
 }
 
 void SetSendingInfo(
-    const std::vector<gcm::GCMStatsRecorder::SendingActivity>& sends,
+    const std::vector<gcm::SendingActivity>& sends,
     base::ListValue* send_info) {
-  std::vector<gcm::GCMStatsRecorder::SendingActivity>::const_iterator it =
-     sends.begin();
+  std::vector<gcm::SendingActivity>::const_iterator it = sends.begin();
   for (; it < sends.end(); ++it) {
     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);
@@ skipping 202 matching lines @@
   html_source->AddResourcePath("gcm_internals.js", IDR_GCM_INTERNALS_JS);
   html_source->SetDefaultResource(IDR_GCM_INTERNALS_HTML);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, html_source);
 
   web_ui->AddMessageHandler(new GcmInternalsUIMessageHandler());
 }
 
 GCMInternalsUI::~GCMInternalsUI() {}