Move all gcm activity types out of GCMStatsRecorder

google_apis/gcm/gcm_client.h

 // Copyright 2013 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_CLIENT_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "google_apis/gcm/base/gcm_export.h"
-#include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
+#include "google_apis/gcm/gcm_activity.h"
 
 template <class T> class scoped_refptr;
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
 namespace net {
 class URLRequestContextGetter;
@@ skipping 102 matching lines @@
     bool is_recording;
     bool gcm_client_created;
     std::string gcm_client_state;
     bool connection_client_created;
     std::string connection_state;
     uint64 android_id;
     std::vector<std::string> registered_app_ids;
     int send_queue_size;
     int resend_queue_size;
 
-    GCMStatsRecorder::RecordedActivities recorded_activities;
+    RecordedActivities recorded_activities;
   };
 
   // A delegate interface that allows the GCMClient instance to interact with
   // its caller, i.e. notifying asynchronous event.
   class Delegate {
    public:
     // Called when the registration completed successfully or an error occurs.
     // |app_id|: application ID.
     // |registration_id|: non-empty if the registration completed successfully.
     // |result|: the type of the error if an error occured, success otherwise.
@@ skipping 107 matching lines @@
   // Clear all recorded GCM activity logs.
   virtual void ClearActivityLogs() = 0;
 
   // Gets internal states and statistics.
   virtual GCMStatistics GetStatistics() const = 0;
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_H_