Small changes that were overlooked in 585487 and 587909

Bug: 672263
Change-Id: I8d8e9c563175f26e8c6cee1aaaa4e9e3dcd2e144
Reviewed-on: https://chromium-review.googlesource.com/592410Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Leslie Watkins <lesliewatkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490779}

chromeos/components/tether/host_scan_cache_unittest.cc

@@ -28,6 +28,8 @@ class TestObserver : public HostScanCache::Observer {
 
  private:
   uint32_t empty_cache_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 }  // namespace
@@ -52,6 +54,9 @@ class HostScanCacheTest : public testing::Test {
 
   std::unique_ptr<FakeHostScanCache> host_scan_cache_;
   std::unique_ptr<TestObserver> observer_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(HostScanCacheTest);
 };
 
 TEST_F(HostScanCacheTest, TestSetAndRemove) {

chromeos/components/tether/host_scanner_unittest.cc

@@ -362,7 +362,7 @@ class HostScannerTest : public NetworkStateTest {
     scanned_device_infos_from_current_scan_.clear();
   }
 
-  void AddWifiNetwork() {
+  void ConnectToWifiNetwork() {
     std::stringstream ss;
     ss << "{"
        << "  \"GUID\": \"wifiNetworkGuid\","
@@ -410,7 +410,7 @@ class HostScannerTest : public NetworkStateTest {
 };
 
 TEST_F(HostScannerTest, TestScan_ConnectedToExistingNetwork) {
-  AddWifiNetwork();
+  ConnectToWifiNetwork();
   EXPECT_TRUE(network_state_handler()->DefaultNetwork());
 
   EXPECT_FALSE(host_scanner_->IsScanActive());