Tether: Break helper TimerFactory out of BleConnectionManager and HostScanCache.

chromeos/components/tether/host_scan_cache_unittest.cc

 // Copyright 2017 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/host_scan_cache.h"
 
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/timer/mock_timer.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/fake_active_host.h"
 #include "chromeos/components/tether/fake_host_scan_cache.h"
 #include "chromeos/components/tether/mock_tether_host_response_recorder.h"
+#include "chromeos/components/tether/timer_factory.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::NiceMock;
 using testing::Invoke;
 
@@ skipping 42 matching lines @@
 };
 
 }  // namespace
 
 // TODO(khorimoto): The test uses a FakeHostScanCache to keep an in-memory
 // cache of expected values. This has the potential to be confusing, since this
 // is the test for HostScanCache. Clean this up to avoid using FakeHostScanCache
 // if possible.
 class HostScanCacheTest : public NetworkStateTest {
  protected:
-  class TestTimerFactory : public HostScanCache::TimerFactory {
+  class TestTimerFactory : public TimerFactory {

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

Move to anonymous namespace.

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

Done.

    public:
     TestTimerFactory() {}
-    ~TestTimerFactory() {}
+    ~TestTimerFactory() override {}
 
     std::unordered_map<std::string, ExtendedMockTimer*>&
     tether_network_guid_to_timer_map() {
       return tether_network_guid_to_timer_map_;
     }
 
     void set_tether_network_guid_for_next_timer(
         const std::string& tether_network_guid_for_next_timer) {
       tether_network_guid_for_next_timer_ = tether_network_guid_for_next_timer;
     }
 
-    // HostScanCache::TimerFactory:
+    // TimerFactory:
     std::unique_ptr<base::Timer> CreateOneShotTimer() override {
       EXPECT_FALSE(tether_network_guid_for_next_timer_.empty());
       ExtendedMockTimer* mock_timer = new ExtendedMockTimer(base::Bind(
           &TestTimerFactory::OnActiveTimerDestructor, base::Unretained(this),
           tether_network_guid_for_next_timer_));
       tether_network_guid_to_timer_map_[tether_network_guid_for_next_timer_] =
           mock_timer;
       return base::WrapUnique(mock_timer);
     }
 
@@ skipping 331 matching lines @@
 
   // Simulate a connection to device 1.
   SetActiveHost(kTetherGuid1);
   SetHasConnectedToHost(kTetherGuid1);
   VerifyCacheMatchesNetworkStack();
 }
 
 }  // namespace tether
 
 }  // namespace chromeos