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

chromeos/network/proxy/ui_proxy_config_service.cc

 // Copyright 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/proxy/ui_proxy_config_service.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/proxy/proxy_config_handler.h"
 #include "chromeos/network/proxy/proxy_config_service_impl.h"
+#include "chromeos/network/tether_constants.h"
 #include "components/device_event_log/device_event_log.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "net/proxy/proxy_config.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* ModeToString(UIProxyConfig::Mode mode) {
@@ skipping 65 matching lines @@
 
 void UIProxyConfigService::UpdateFromPrefs(const std::string& network_guid) {
   current_ui_network_guid_ = network_guid;
   const NetworkState* network = nullptr;
   if (!network_guid.empty()) {
     network =
         NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
             network_guid);
     if (!network) {
       NET_LOG(ERROR) << "No NetworkState for guid: " << network_guid;
-    } else if (!network->IsInProfile()) {
+    } else if (!network->IsInProfile() && network->type() != kTypeTether) {
+      // Tether networks are not expected to have an associated profile; only
+      // log an error if the provided properties do not correspond to a
+      // Tether network.
       NET_LOG(ERROR) << "Network not in profile: " << network_guid;
       network = nullptr;
     }
   }
   if (!network) {
     current_ui_network_guid_.clear();
     current_ui_config_ = UIProxyConfig();
     return;
   }
 
@@ skipping 108 matching lines @@
           current_ui_network_guid_);
   if (!network)
     return;
   UpdateFromPrefs(current_ui_network_guid_);
   NetworkHandler::Get()
       ->network_state_handler()
       ->SendUpdateNotificationForNetwork(network->path());
 }
 
 }  // namespace chromeos