Move all gcm activity types out of GCMStatsRecorder

google_apis/gcm/monitoring/gcm_stats_recorder.h

Index: google_apis/gcm/monitoring/gcm_stats_recorder.h
diff --git a/google_apis/gcm/monitoring/gcm_stats_recorder.h b/google_apis/gcm/monitoring/gcm_stats_recorder.h
index bc2afb228b233b3c46d1c89ff246a88b7875d029..45cf5fc978c3f46a66750ec349c6d41b07c5ad34 100644
--- a/google_apis/gcm/monitoring/gcm_stats_recorder.h
+++ b/google_apis/gcm/monitoring/gcm_stats_recorder.h
@@ -15,6 +15,7 @@
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/engine/registration_request.h"
 #include "google_apis/gcm/engine/unregistration_request.h"
+#include "google_apis/gcm/gcm_activity.h"
 
 namespace gcm {
 
@@ -33,68 +34,6 @@ class GCM_EXPORT GCMStatsRecorder {
     DELETED_MESSAGES,
   };
 
-  // Contains data that are common to all activity kinds below.
-  struct GCM_EXPORT Activity {
-    Activity();
-    virtual ~Activity();
-
-    base::Time time;
-    std::string event;    // A short description of the event.
-    std::string details;  // Any additional detail about the event.
-  };
-
-  // Contains relevant data of a connection activity.
-  struct GCM_EXPORT ConnectionActivity : Activity {
-    ConnectionActivity();
-    virtual ~ConnectionActivity();
-  };
-
-  // Contains relevant data of a check-in activity.
-  struct GCM_EXPORT CheckinActivity : Activity {
-    CheckinActivity();
-    virtual ~CheckinActivity();
-  };
-
-  // Contains relevant data of a registration/unregistration step.
-  struct GCM_EXPORT RegistrationActivity : Activity {
-    RegistrationActivity();
-    virtual ~RegistrationActivity();
-
-    std::string app_id;
-    std::string sender_ids;  // Comma separated sender ids.
-  };
-
-  // Contains relevant data of a message receiving event.
-  struct GCM_EXPORT ReceivingActivity : Activity {
-    ReceivingActivity();
-    virtual ~ReceivingActivity();
-
-    std::string app_id;
-    std::string from;
-    int message_byte_size;
-  };
-
-  // Contains relevant data of a send-message step.
-  struct GCM_EXPORT SendingActivity : Activity {
-    SendingActivity();
-    virtual ~SendingActivity();
-
-    std::string app_id;
-    std::string receiver_id;
-    std::string message_id;
-  };
-
-  struct GCM_EXPORT RecordedActivities {
-    RecordedActivities();
-    virtual ~RecordedActivities();
-
-    std::vector<GCMStatsRecorder::CheckinActivity> checkin_activities;
-    std::vector<GCMStatsRecorder::ConnectionActivity> connection_activities;
-    std::vector<GCMStatsRecorder::RegistrationActivity> registration_activities;
-    std::vector<GCMStatsRecorder::ReceivingActivity> receiving_activities;
-    std::vector<GCMStatsRecorder::SendingActivity> sending_activities;
-  };
-
   // A delegate interface that allows the GCMStatsRecorder instance to interact
   // with its container.
   class Delegate {