Move all gcm activity types out of GCMStatsRecorder

chrome/browser/ui/webui/gcm_internals_ui.cc

Index: chrome/browser/ui/webui/gcm_internals_ui.cc
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc
index 7f63accb06ae0a4ba371969c60a7b14530e631be..84a6ec861548d73f6d5ae9bc94501bfd41320be0 100644
--- a/chrome/browser/ui/webui/gcm_internals_ui.cc
+++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -28,10 +28,9 @@
 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);
@@ -43,10 +42,9 @@ void SetCheckinInfo(
 }
 
 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);
@@ -58,10 +56,9 @@ void SetConnectionInfo(
 }
 
 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();
@@ -76,10 +73,9 @@ void SetRegistrationInfo(
 }
 
 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);
@@ -94,10 +90,9 @@ void SetReceivingInfo(
 }
 
 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);