Tether: Break helper TimerFactory out of BleConnectionManager and HostScanCache.

chromeos/components/tether/ble_connection_manager_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 "chromeos/components/tether/ble_connection_manager.h"
 
 #include "base/logging.h"
 #include "base/timer/mock_timer.h"
 #include "chromeos/components/tether/ble_constants.h"
 #include "chromeos/components/tether/proto/tether.pb.h"
+#include "chromeos/components/tether/timer_factory.h"
 #include "components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h"
 #include "components/cryptauth/bluetooth_throttler.h"
 #include "components/cryptauth/connection.h"
 #include "components/cryptauth/fake_connection.h"
 #include "components/cryptauth/fake_cryptauth_service.h"
 #include "components/cryptauth/fake_secure_channel.h"
 #include "components/cryptauth/fake_secure_message_delegate.h"
 #include "components/cryptauth/remote_device_test_util.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 32 matching lines @@
 
 struct ReceivedMessage {
   ReceivedMessage(const cryptauth::RemoteDevice& remote_device,
                   const std::string& payload)
       : remote_device(remote_device), payload(payload) {}
 
   cryptauth::RemoteDevice remote_device;
   std::string payload;
 };
 
+class MockTimerFactory : public TimerFactory {
+ public:
+  std::unique_ptr<base::Timer> CreateOneShotTimer() override {
+    return base::MakeUnique<base::MockTimer>(false /* retains_user_task */,
+                                             false /* is_repeating */);
+  }
+};
+
 class TestObserver : public BleConnectionManager::Observer {
  public:
   TestObserver() {}
 
   // BleConnectionManager::Observer:
   void OnSecureChannelStatusChanged(
       const cryptauth::RemoteDevice& remote_device,
       const cryptauth::SecureChannel::Status& old_status,
       const cryptauth::SecureChannel::Status& new_status) override {
     connection_status_changes_.push_back(
@@ skipping 149 matching lines @@
           static_cast<FakeConnectionWithAddress*>(connection.get());
       EXPECT_EQ(expected_device_address_, fake_connection->GetDeviceAddress());
       return base::WrapUnique(
           new FakeSecureChannel(std::move(connection), cryptauth_service));
     }
 
    private:
     std::string expected_device_address_;
   };
 
-  class MockTimerFactory : public BleConnectionManager::TimerFactory {
-   public:
-    std::unique_ptr<base::Timer> CreateTimer() override {
-      return base::MakeUnique<base::MockTimer>(false /* retains_user_task */,
-                                               false /* is_repeating */);
-    }
-  };
-
   BleConnectionManagerTest() : test_devices_(CreateTestDevices(4)) {
     // These tests assume a maximum of two concurrent advertisers. Some of the
     // multi-device tests would need to be re-written if this constant changes.
     EXPECT_EQ(2, kMaxConcurrentAdvertisements);
   }
 
   void SetUp() override {
     verified_status_changes_.clear();
     verified_received_messages_.clear();
 
@@ skipping 961 matching lines @@
        cryptauth::SecureChannel::Status::DISCONNECTED},
       {test_devices_[1], cryptauth::SecureChannel::Status::CONNECTING,
        cryptauth::SecureChannel::Status::DISCONNECTED},
       {test_devices_[2], cryptauth::SecureChannel::Status::CONNECTING,
        cryptauth::SecureChannel::Status::DISCONNECTED}});
 }
 
 }  // namespace tether
 
 }  // namespace cryptauth