Settings: Network: Merge Tether networks into Mobile subpage

chromeos/network/network_state_handler.cc

 // Copyright (c) 2012 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_state_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 140 matching lines @@
 void NetworkStateHandler::SetTechnologyEnabled(
     const NetworkTypePattern& type,
     bool enabled,
     const network_handler::ErrorCallback& error_callback) {
   std::vector<std::string> technologies = GetTechnologiesForType(type);
   for (const std::string& technology : technologies) {
     if (technology == kTypeTether) {
       if (tether_technology_state_ != TECHNOLOGY_ENABLED &&
           tether_technology_state_ != TECHNOLOGY_AVAILABLE) {
         NET_LOG(ERROR) << "SetTechnologyEnabled() called for the Tether "
-                       << "DeviceState, but the current state was not "
-                       << "TECHNOLOGY_ENABLED or TECHNOLOGY_AVAILABLE.";
+                       << "DeviceState, but the current state was: "
+                       << tether_technology_state_;
         network_handler::RunErrorCallback(
             error_callback, kTetherDevicePath,
             NetworkConnectionHandler::kErrorEnabledOrDisabledWhenNotAvailable,
             "");
         continue;
       }
 
       // Tether does not exist in Shill, so set |tether_technology_state_| and
       // skip the below interactions with |shill_property_handler_|.
       tether_technology_state_ =
@@ skipping 1309 matching lines @@
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
   if (type.MatchesType(kTypeTether))
     technologies.emplace_back(kTypeTether);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos