[CrOS Tether] Update NetworkConfigurationHandler::GetShillProperties() to work with Tether networks.

chromeos/network/network_configuration_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_configuration_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 210 matching lines @@
 void NetworkConfigurationHandler::RemoveObserver(
     NetworkConfigurationObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NetworkConfigurationHandler::GetShillProperties(
     const std::string& service_path,
     const network_handler::DictionaryResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG(USER) << "GetShillProperties: " << service_path;
+
+  const NetworkState* network_state =
+      network_state_handler_->GetNetworkState(service_path);
+  if (network_state &&

[stevenjb, 2017/04/24 21:26:41]

As long as we are doing this lookup, we can fail early if network_state is null;
just invoke error_callback with a "not found" error.

[Kyle Horimoto, 2017/04/25 01:18:32]

I don't think this is the right thing to do. I made this change and ran it, and
it failed on VPN networks.

It also made these two tests fail:
ManagedNetworkConfigurationHandlerTest.AutoConnectDisallowed
NetworkConfigurationHandlerTest.GetProperties

I'm going to leave it as I wrote it.

+      NetworkTypePattern::Tether().MatchesType(network_state->type())) {
+    // If this is a Tether network, use the properties present in the
+    // NetworkState object provided by NetworkStateHandler. Tether networks are
+    // not present in Shill, so the Shill call below will not work.
+    base::DictionaryValue dictionary;
+    network_state->GetStateProperties(&dictionary);
+    callback.Run(service_path, dictionary);
+    return;
+  }
+
   DBusThreadManager::Get()->GetShillServiceClient()->GetProperties(
       dbus::ObjectPath(service_path),
       base::Bind(&NetworkConfigurationHandler::GetPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr(), callback, error_callback,
                  service_path));
 }
 
 void NetworkConfigurationHandler::SetShillProperties(
     const std::string& service_path,
     const base::DictionaryValue& shill_properties,
@@ skipping 405 matching lines @@
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler,
     NetworkDeviceHandler* network_device_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler, network_device_handler);
   return handler;
 }
 
 }  // namespace chromeos