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

chromeos/network/network_connection_handler.cc

 // Copyright (c) 2013 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/network/network_connection_handler.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 40 matching lines @@
     "configure-failed";
 const char NetworkConnectionHandler::kErrorConnectCanceled[] =
     "connect-canceled";
 const char NetworkConnectionHandler::kErrorCertLoadTimeout[] =
     "cert-load-timeout";
 const char NetworkConnectionHandler::kErrorUnmanagedNetwork[] =
     "unmanaged-network";
 const char NetworkConnectionHandler::kErrorActivateFailed[] = "activate-failed";
 const char NetworkConnectionHandler::kErrorEnabledOrDisabledWhenNotAvailable[] =
     "not-available";
-const char
-    NetworkConnectionHandler::kErrorTetherConnectionAttemptWithNoDelegate[] =
-        "tether-with-no-delegate";
+const char NetworkConnectionHandler::kErrorTetherAttemptWithNoDelegate[] =
+    "tether-with-no-delegate";
 
 NetworkConnectionHandler::NetworkConnectionHandler()
     : tether_delegate_(nullptr), weak_ptr_factory_(this) {}
 
 NetworkConnectionHandler::~NetworkConnectionHandler() {}
 
 void NetworkConnectionHandler::AddObserver(
     NetworkConnectionObserver* observer) {
   observers_.AddObserver(observer);
 }
@@ skipping 36 matching lines @@
   DCHECK(tether_delegate_);
   tether_delegate_->ConnectToNetwork(
       tether_network_guid,
       base::Bind(&NetworkConnectionHandler::InvokeConnectSuccessCallback,
                  weak_ptr_factory_.GetWeakPtr(), tether_network_guid,
                  success_callback),
       base::Bind(&NetworkConnectionHandler::InvokeConnectErrorCallback,
                  weak_ptr_factory_.GetWeakPtr(), tether_network_guid,
                  error_callback));
 }
+
+void NetworkConnectionHandler::InitiateTetherNetworkDisconnection(
+    const std::string& tether_network_guid,
+    const base::Closure& success_callback,
+    const network_handler::ErrorCallback& error_callback) {
+  DCHECK(tether_delegate_);
+  tether_delegate_->DisconnectFromNetwork(
+      tether_network_guid,
+      base::Bind(&NetworkConnectionHandler::InvokeConnectSuccessCallback,
+                 weak_ptr_factory_.GetWeakPtr(), tether_network_guid,
+                 success_callback),
+      base::Bind(&NetworkConnectionHandler::InvokeConnectErrorCallback,
+                 weak_ptr_factory_.GetWeakPtr(), tether_network_guid,
+                 error_callback));
+}
+
 }  // namespace chromeos