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 201 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 {
+  class MockTimerFactory : public TimerFactory {

[khorimoto, 2017/05/31 18:13:28]

Move to anonymous namespace.

[Ryan Hansberry, 2017/05/31 18:24:54]

Done.

    public:
-    std::unique_ptr<base::Timer> CreateTimer() override {
+    std::unique_ptr<base::Timer> CreateOneShotTimer() 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);
   }
@@ skipping 966 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