Move all gcm activity types out of GCMStatsRecorder

google_apis/gcm/gcm_activity.h

Index: google_apis/gcm/gcm_activity.h
diff --git a/google_apis/gcm/gcm_activity.h b/google_apis/gcm/gcm_activity.h
new file mode 100644
index 0000000000000000000000000000000000000000..80f34acd400767cf1dc5de9ce0b8fa8aab4793ab
--- /dev/null
+++ b/google_apis/gcm/gcm_activity.h
@@ -0,0 +1,80 @@
+// 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.
+
+#ifndef GOOGLE_APIS_GCM_GCM_ACTIVITY_H_
+#define GOOGLE_APIS_GCM_GCM_ACTIVITY_H_
+
+#include <string>
+#include <vector>
+
+#include "base/time/time.h"
+#include "google_apis/gcm/base/gcm_export.h"
+
+namespace gcm {
+
+// 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<CheckinActivity> checkin_activities;
+  std::vector<ConnectionActivity> connection_activities;
+  std::vector<RegistrationActivity> registration_activities;
+  std::vector<ReceivingActivity> receiving_activities;
+  std::vector<SendingActivity> sending_activities;
+};
+
+}  // namespace gcm
+
+#endif  // GOOGLE_APIS_GCM_GCM_ACTIVITY_H_