[Remoting Android] Refactor ClientTelemetryLogger

remoting/client/client_telemetry_logger_unittest.cc

 // Copyright 2016 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 "remoting/client/client_telemetry_logger.h"
 
 #include <deque>
 #include <string>
 
 #include "base/memory/ptr_util.h"
@@ skipping 79 matching lines @@
 void FakeLogWriter::SetAuthClosure(const base::Closure& closure) {
   auth_closure_ = closure;
 }
 
 class ClientTelemetryLoggerTest : public testing::Test {
  public:
   // testing::Test override.
   void SetUp() override;
 
  protected:
-  // |log_writer_| will be owned by |logger_| and freed when |logger_|
-  // destructs. Feel free to use this reference in the test.
-  FakeLogWriter* log_writer_ = nullptr;
+  std::unique_ptr<FakeLogWriter> log_writer_;
   std::unique_ptr<ClientTelemetryLogger> logger_;
 };
 
 void ClientTelemetryLoggerTest::SetUp() {
-  log_writer_ = new FakeLogWriter();
-  logger_.reset(new ClientTelemetryLogger(ChromotingEvent::Mode::ME2ME));
-  logger_->StartForTest(base::WrapUnique(log_writer_));
+  log_writer_.reset(new FakeLogWriter());
+  logger_.reset(new ClientTelemetryLogger(log_writer_.get(),
+                                          ChromotingEvent::Mode::ME2ME));
 }
 
 TEST_F(ClientTelemetryLoggerTest, LogSessionStateChange) {
   ChromotingEvent event(ChromotingEvent::Type::SESSION_STATE);
   event.SetEnum("session_state", ChromotingEvent::SessionState::CONNECTED);
   event.SetEnum("connection_error", ChromotingEvent::ConnectionError::NONE);
   log_writer_->AddExpectedEvent(event);
   logger_->LogSessionStateChange(ChromotingEvent::SessionState::CONNECTED,
                                  ChromotingEvent::ConnectionError::NONE);
 
@@ skipping 47 matching lines @@
 
   // kMaxSessionIdAgeDays = 1. Fake the generation time to be 2 days ago and
   // force it to expire.
   logger_->SetSessionIdGenerationTimeForTest(base::TimeTicks::Now() -
                                              base::TimeDelta::FromDays(2));
   protocol::PerformanceTracker perf_tracker;
   logger_->LogStatistics(&perf_tracker);
   EXPECT_NE(last_id, logger_->session_id());
 }
 
-TEST_F(ClientTelemetryLoggerTest, PassesThroughAuthTokenAndClosure) {
-  std::string token("some token");
-  base::Closure closure = base::Bind(&base::DoNothing);
-  logger_->SetAuthToken(token);
-  logger_->SetAuthClosure(closure);
-  EXPECT_EQ(token, log_writer_->auth_token());
-  EXPECT_TRUE(closure.Equals(log_writer_->auth_closure()));
-}
-
 }  // namespace remoting