Revert 264313 "Add activity recording capability to gcm internal..."

trunk/src/chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 158 matching lines @@
   void Reset();
   void Load(const base::WeakPtr<GCMProfileService>& service);
   void Stop();
   void CheckOut();
   void Register(const std::string& app_id,
                 const std::vector<std::string>& sender_ids);
   void Unregister(const std::string& app_id);
   void Send(const std::string& app_id,
             const std::string& receiver_id,
             const GCMClient::OutgoingMessage& message);
-  void GetGCMStatistics(bool clear_logs);
-  void SetGCMRecording(bool recording);
+  void RequestGCMStatistics();
 
   // For testing purpose. Can be called from UI thread. Use with care.
   GCMClient* gcm_client_for_testing() const { return gcm_client_.get(); }
 
  private:
   friend class base::RefCountedThreadSafe<IOWorker>;
   virtual ~IOWorker();
 
   base::WeakPtr<GCMProfileService> service_;
 
@@ skipping 175 matching lines @@
 
 void GCMProfileService::IOWorker::Send(
     const std::string& app_id,
     const std::string& receiver_id,
     const GCMClient::OutgoingMessage& message) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
   gcm_client_->Send(app_id, receiver_id, message);
 }
 
-void GCMProfileService::IOWorker::GetGCMStatistics(bool clear_logs) {
+void GCMProfileService::IOWorker::RequestGCMStatistics() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   gcm::GCMClient::GCMStatistics stats;
 
   if (gcm_client_.get()) {
-    if (clear_logs)
-      gcm_client_->ClearActivityLogs();
+    stats.gcm_client_created = true;
     stats = gcm_client_->GetStatistics();
   }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
-      base::Bind(&GCMProfileService::GetGCMStatisticsFinished,
-                 service_,
-                 stats));
-}
-
-void GCMProfileService::IOWorker::SetGCMRecording(bool recording) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  gcm::GCMClient::GCMStatistics stats;
-
-  if (gcm_client_.get()) {
-    gcm_client_->SetRecording(recording);
-    stats = gcm_client_->GetStatistics();
-    stats.gcm_client_created = true;
-  }
-
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&GCMProfileService::GetGCMStatisticsFinished,
+      base::Bind(&GCMProfileService::RequestGCMStatisticsFinished,
                  service_,
                  stats));
 }
 
 std::string GCMProfileService::GetGCMEnabledStateString(GCMEnabledState state) {
   switch (state) {
     case GCMProfileService::ALWAYS_ENABLED:
       return "ALWAYS_ENABLED";
     case GCMProfileService::ENABLED_FOR_APPS:
       return "ENABLED_FOR_APPS";
@@ skipping 283 matching lines @@
 }
 
 std::string GCMProfileService::SignedInUserName() const {
   return username_;
 }
 
 bool GCMProfileService::IsGCMClientReady() const {
   return gcm_client_ready_;
 }
 
-void GCMProfileService::GetGCMStatistics(
-    GetGCMStatisticsCallback callback, bool clear_logs) {
+void GCMProfileService::RequestGCMStatistics(
+    RequestGCMStatisticsCallback callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   request_gcm_statistics_callback_ = callback;
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
-      base::Bind(&GCMProfileService::IOWorker::GetGCMStatistics,
-                 io_worker_,
-                 clear_logs));
-}
-
-void GCMProfileService::SetGCMRecording(
-    GetGCMStatisticsCallback callback, bool recording) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-
-  request_gcm_statistics_callback_ = callback;
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(&GCMProfileService::IOWorker::SetGCMRecording,
-                 io_worker_,
-                 recording));
+      base::Bind(&GCMProfileService::IOWorker::RequestGCMStatistics,
+                 io_worker_));
 }
 
 void GCMProfileService::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   switch (type) {
     case chrome::NOTIFICATION_PROFILE_DESTROYED:
       ResetGCMClient();
@@ skipping 185 matching lines @@
 
   delayed_task_controller_->SetReady();
 }
 
 GCMAppHandler* GCMProfileService::GetAppHandler(const std::string& app_id) {
   std::map<std::string, GCMAppHandler*>::const_iterator iter =
       app_handlers_.find(app_id);
   return iter == app_handlers_.end() ? &default_app_handler_ : iter->second;
 }
 
-void GCMProfileService::GetGCMStatisticsFinished(
+void GCMProfileService::RequestGCMStatisticsFinished(
     GCMClient::GCMStatistics stats) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
   request_gcm_statistics_callback_.Run(stats);
 }
 
 }  // namespace gcm