Move all gcm activity types out of GCMStatsRecorder

google_apis/gcm/monitoring/gcm_stats_recorder.h

 // 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_STATS_RECORDER_H_
 #define GOOGLE_APIS_GCM_GCM_STATS_RECORDER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/engine/connection_factory.h"
 #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 {
 
 // Records GCM internal stats and activities for debugging purpose. Recording
 // can be turned on/off by calling SetRecording(...) function. It is turned off
 // by default.
 // This class is not thread safe. It is meant to be owned by a gcm client
 // instance.
 class GCM_EXPORT GCMStatsRecorder {
  public:
   // Type of a received message
   enum ReceivedMessageType {
     // Data message.
     DATA_MESSAGE,
     // Message that indicates some messages have been deleted on the server.
     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 {
    public:
     // Called when the GCMStatsRecorder is recording activities and a new
     // activity has just been recorded.
     virtual void OnActivityRecorded() = 0;
   };
 
   GCMStatsRecorder();
@@ skipping 158 matching lines @@
   std::deque<RegistrationActivity> registration_activities_;
   std::deque<ReceivingActivity> receiving_activities_;
   std::deque<SendingActivity> sending_activities_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMStatsRecorder);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_STATS_RECORDER_H_