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

trunk/src/google_apis/gcm/engine/mcs_client_unittest.cc

 // 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.
 
 #include "google_apis/gcm/engine/mcs_client.h"
 
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/simple_test_clock.h"
 #include "components/os_crypt/os_crypt_switches.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/fake_connection_factory.h"
 #include "google_apis/gcm/engine/fake_connection_handler.h"
 #include "google_apis/gcm/engine/gcm_store_impl.h"
-#include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 const uint64 kAndroidId = 54321;
 const uint64 kSecurityToken = 12345;
 
 // Number of messages to send when testing batching.
@@ skipping 32 matching lines @@
   data_message.set_token(token);
   data_message.set_device_user_id(user_id);
   return MCSMessage(kDataMessageStanzaTag, data_message);
 }
 
 // MCSClient with overriden exposed persistent id logic.
 class TestMCSClient : public MCSClient {
  public:
   TestMCSClient(base::Clock* clock,
                 ConnectionFactory* connection_factory,
-                GCMStore* gcm_store,
-                gcm::GCMStatsRecorder* recorder)
-    : MCSClient("", clock, connection_factory, gcm_store, recorder),
+                GCMStore* gcm_store)
+    : MCSClient("", clock, connection_factory, gcm_store),
       next_id_(0) {
   }
 
   virtual std::string GetNextPersistentId() OVERRIDE {
     return base::UintToString(++next_id_);
   }
 
  private:
   uint32 next_id_;
 };
@@ skipping 47 matching lines @@
   scoped_ptr<GCMStore> gcm_store_;
 
   FakeConnectionFactory connection_factory_;
   scoped_ptr<TestMCSClient> mcs_client_;
   bool init_success_;
   uint64 restored_android_id_;
   uint64 restored_security_token_;
   scoped_ptr<MCSMessage> received_message_;
   std::string sent_message_id_;
   MCSClient::MessageSendStatus message_send_status_;
-
-  gcm::GCMStatsRecorder recorder_;
 };
 
 MCSClientTest::MCSClientTest()
     : run_loop_(new base::RunLoop()),
       init_success_(true),
       restored_android_id_(0),
       restored_security_token_(0),
       message_send_status_(MCSClient::SENT) {
   EXPECT_TRUE(temp_directory_.CreateUniqueTempDir());
   run_loop_.reset(new base::RunLoop());
@@ skipping 10 matching lines @@
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       os_crypt::switches::kUseMockKeychain);
 #endif  // OS_MACOSX
 }
 
 void MCSClientTest::BuildMCSClient() {
   gcm_store_.reset(new GCMStoreImpl(temp_directory_.path(),
                                     message_loop_.message_loop_proxy()));
   mcs_client_.reset(new TestMCSClient(&clock_,
                                       &connection_factory_,
-                                      gcm_store_.get(),
-                                      &recorder_));
+                                      gcm_store_.get()));
 }
 
 void MCSClientTest::InitializeClient() {
   gcm_store_->Load(base::Bind(
       &MCSClient::Initialize,
       base::Unretained(mcs_client_.get()),
       base::Bind(&MCSClientTest::ErrorCallback,
                  base::Unretained(this)),
       base::Bind(&MCSClientTest::MessageReceivedCallback,
                  base::Unretained(this)),
@@ skipping 607 matching lines @@
 
   LoginClient(std::vector<std::string>());
   GetFakeHandler()->ExpectOutgoingMessage(message);
   GetFakeHandler()->ExpectOutgoingMessage(message2);
   PumpLoop();
 }
 
 } // namespace
 
 }  // namespace gcm