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

chromeos/network/network_connection_handler_impl.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_impl.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 223 matching lines @@
     }
 
     if (NetworkTypePattern::Tether().MatchesType(network->type())) {
       if (tether_delegate_) {
         const std::string& tether_network_guid = network->guid();
         DCHECK(!tether_network_guid.empty());
         InitiateTetherNetworkConnection(tether_network_guid, success_callback,
                                         error_callback);
       } else {
         InvokeConnectErrorCallback(service_path, error_callback,
-                                   kErrorTetherConnectionAttemptWithNoDelegate);
+                                   kErrorTetherAttemptWithNoDelegate);
       }
       return;
     }
   }
 
   // If the network does not have a profile path, specify the correct default
   // profile here and set it once connected. Otherwise leave it empty to
   // indicate that it does not need to be set.
   std::string profile_path;
   if (!network || network->profile_path().empty())
@@ skipping 43 matching lines @@
     network_handler::RunErrorCallback(error_callback, service_path,
                                       kErrorNotFound, "");
     return;
   }
   if (!network->IsConnectedState() && !network->IsConnectingState()) {
     NET_LOG_ERROR("Disconnect Error: Not Connected", service_path);
     network_handler::RunErrorCallback(error_callback, service_path,
                                       kErrorNotConnected, "");
     return;
   }
+  if (NetworkTypePattern::Tether().MatchesType(network->type())) {
+    if (tether_delegate_) {
+      const std::string& tether_network_guid = network->guid();
+      DCHECK(!tether_network_guid.empty());
+      InitiateTetherNetworkDisconnection(tether_network_guid, success_callback,
+                                         error_callback);
+    } else {
+      InvokeConnectErrorCallback(service_path, error_callback,
+                                 kErrorTetherAttemptWithNoDelegate);
+    }
+    return;
+  }
   pending_requests_.erase(service_path);
   CallShillDisconnect(service_path, success_callback, error_callback);
 }
 
 bool NetworkConnectionHandlerImpl::HasConnectingNetwork(
     const std::string& service_path) {
   return pending_requests_.count(service_path) != 0;
 }
 
 bool NetworkConnectionHandlerImpl::HasPendingConnectRequest() {
@@ skipping 448 matching lines @@
 
 void NetworkConnectionHandlerImpl::HandleShillDisconnectSuccess(
     const std::string& service_path,
     const base::Closure& success_callback) {
   NET_LOG_EVENT("Disconnect Request Sent", service_path);
   if (!success_callback.is_null())
     success_callback.Run();
 }
 
 }  // namespace chromeos