[CrOS Tether] Add disconnect handling to NetworkConnectionHandler::TetherDelegate.

chromeos/components/tether/network_connection_handler_tether_delegate_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/network_connection_handler_tether_delegate.h"
 
 #include <memory>
 
 #include "chromeos/components/tether/tether_connector.h"
 #include "chromeos/components/tether/tether_disconnector.h"
@@ skipping 15 matching lines @@
   TestNetworkConnectionHandler() : NetworkConnectionHandler() {}
   ~TestNetworkConnectionHandler() override {}
 
   void CallTetherConnect(const std::string& tether_network_guid,
                          const base::Closure& success_callback,
                          const network_handler::ErrorCallback& error_callback) {
     InitiateTetherNetworkConnection(tether_network_guid, success_callback,
                                     error_callback);
   }
 
+  void CallTetherDisconnect(
+      const std::string& tether_network_guid,
+      const base::Closure& success_callback,
+      const network_handler::ErrorCallback& error_callback) {
+    InitiateTetherNetworkDisconnection(tether_network_guid, success_callback,
+                                       error_callback);
+  }
+
   // NetworkConnectionHandler:
   void ConnectToNetwork(const std::string& service_path,
                         const base::Closure& success_callback,
                         const network_handler::ErrorCallback& error_callback,
                         bool check_error_state) override {}
 
   void DisconnectNetwork(
       const std::string& service_path,
       const base::Closure& success_callback,
       const network_handler::ErrorCallback& error_callback) override {}
@@ skipping 36 matching lines @@
                            nullptr /* network_state_handler */,
                            nullptr /* active_host */,
                            nullptr /* ble_connection_manager */,
                            nullptr /* network_configuration_remover */,
                            nullptr /* tether_connector */,
                            nullptr /* device_id_tether_network_guid_map */,
                            nullptr /* tether_host_fetcher */) {}
   ~MockTetherDisconnector() override {}
 
   MOCK_METHOD3(
-      DisconnectFomNetwork,
+      DisconnectFromNetwork,
       void(const std::string& tether_network_guid,
            const base::Closure& success_callback,
            const network_handler::StringResultCallback& error_callback));
 };
 
 }  // namespace
 
-// TODO(khorimoto): Also write a test for disconnection. This is part of a
-// follow-up CL.
 class NetworkConnectionHandlerTetherDelegateTest : public testing::Test {
  protected:
   NetworkConnectionHandlerTetherDelegateTest() {}
 
   void SetUp() override {
     test_network_connection_handler_ =
         base::WrapUnique(new TestNetworkConnectionHandler());
     mock_tether_connector_ =
         base::WrapUnique(new NiceMock<MockTetherConnector>());
     mock_tether_disconnector_ =
@@ skipping 15 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandlerTetherDelegateTest);
 };
 
 TEST_F(NetworkConnectionHandlerTetherDelegateTest, TestConnect) {
   EXPECT_CALL(*mock_tether_connector_, ConnectToNetwork(_, _, _));
 
   test_network_connection_handler_->CallTetherConnect(
       "tetherNetworkGuid", base::Closure(), network_handler::ErrorCallback());
 }
 
+TEST_F(NetworkConnectionHandlerTetherDelegateTest, TestDisconnect) {
+  EXPECT_CALL(*mock_tether_disconnector_, DisconnectFromNetwork(_, _, _));
+
+  test_network_connection_handler_->CallTetherDisconnect(
+      "tetherNetworkGuid", base::Closure(), network_handler::ErrorCallback());
+}
+
 }  // namespace tether
 
 }  // namespace cryptauth