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

trunk/src/google_apis/gcm/gcm_client_impl.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_IMPL_H_
 #define GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/engine/gcm_store.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_client.h"
-#include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
-#include "google_apis/gcm/protocol/android_checkin.pb.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "net/base/net_log.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class GURL;
 
 namespace base {
 class Clock;
 }  // namespace base
 
-namespace mcs_proto {
-class DataMessageStanza;
-}  // namespace mcs_proto
-
 namespace net {
 class HttpNetworkSession;
 }  // namespace net
 
 namespace gcm {
 
 class CheckinRequest;
 class ConnectionFactory;
 class GCMClientImplTest;
 
 // Helper class for building GCM internals. Allows tests to inject fake versions
 // as necessary.
 class GCM_EXPORT GCMInternalsBuilder {
  public:
   GCMInternalsBuilder();
   virtual ~GCMInternalsBuilder();
 
   virtual scoped_ptr<base::Clock> BuildClock();
   virtual scoped_ptr<MCSClient> BuildMCSClient(
       const std::string& version,
       base::Clock* clock,
       ConnectionFactory* connection_factory,
-      GCMStore* gcm_store,
-      GCMStatsRecorder* recorder);
+      GCMStore* gcm_store);
   virtual scoped_ptr<ConnectionFactory> BuildConnectionFactory(
       const std::vector<GURL>& endpoints,
       const net::BackoffEntry::Policy& backoff_policy,
       scoped_refptr<net::HttpNetworkSession> network_session,
       net::NetLog* net_log);
 };
 
 // Implements the GCM Client. It is used to coordinate MCS Client (communication
 // with MCS) and other pieces of GCM infrastructure like Registration and
 // Checkins. It also allows for registering user delegates that host
@@ skipping 14 matching lines @@
       Delegate* delegate) OVERRIDE;
   virtual void Load() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void CheckOut() OVERRIDE;
   virtual void Register(const std::string& app_id,
                         const std::vector<std::string>& sender_ids) OVERRIDE;
   virtual void Unregister(const std::string& app_id) OVERRIDE;
   virtual void Send(const std::string& app_id,
                     const std::string& receiver_id,
                     const OutgoingMessage& message) OVERRIDE;
-  virtual void SetRecording(bool recording) OVERRIDE;
-  virtual void ClearActivityLogs() OVERRIDE;
   virtual GCMStatistics GetStatistics() const OVERRIDE;
 
  private:
   // State representation of the GCMClient.
   // Any change made to this enum should have corresponding change in the
   // GetStateString(...) function.
   enum State {
     // Uninitialized.
     UNINITIALIZED,
     // Initialized,
@@ skipping 104 matching lines @@
 
   // Fires OnMessageSendError event on the delegate of this calss, based on the
   // details in |data_message_stanza| and |message_data|.
   void HandleIncomingSendError(
       const mcs_proto::DataMessageStanza& data_message_stanza,
       MessageData& message_data);
 
   // Builder for the GCM internals (mcs client, etc.).
   scoped_ptr<GCMInternalsBuilder> internals_builder_;
 
-  // Recorder that logs GCM activities.
-  GCMStatsRecorder recorder_;
-
   // State of the GCM Client Implementation.
   State state_;
 
   Delegate* delegate_;
 
   // Device checkin info (android ID and security token used by device).
   CheckinInfo device_checkin_info_;
 
   // Clock used for timing of retry logic. Passed in for testing. Owned by
   // GCMClientImpl.
@@ skipping 35 matching lines @@
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_GCM_CLIENT_IMPL_H_