Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index c3349d444f2ee165c3e482928fe636b56d619356..8785a7bd904f0d7aebd8dca53be46f7b18064483 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -37,6 +37,7 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
+#include "chrome/browser/chromeos/ui_proxy_config_service.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -49,6 +50,7 @@
 #include "chrome/common/time_format.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_ip_config.h"
+#include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "content/public/browser/notification_service.h"
@@ -522,7 +524,7 @@ void PopulateVPNDetails(
 
   chromeos::NetworkPropertyUIData hostname_ui_data;
   hostname_ui_data.ParseOncProperty(
-      vpn->ui_data(), &onc,
+      vpn->ui_data().onc_source(), &onc,
       base::StringPrintf("%s.%s",
                          chromeos::onc::network_config::kVPN,
                          chromeos::onc::vpn::kHost));
@@ -1258,11 +1260,11 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(
   if (!network)
     return;
 
-  Profile::FromWebUI(web_ui())->GetProxyConfigTracker()->UISetCurrentNetwork(
-      service_path);
+  Profile::FromWebUI(web_ui())->
+      GetProxyConfigTracker()->GetUIService().SetCurrentNetwork(service_path);
 
   const chromeos::NetworkUIData& ui_data = network->ui_data();
-  const chromeos::NetworkPropertyUIData property_ui_data(ui_data);
+  const chromeos::NetworkPropertyUIData property_ui_data(ui_data.onc_source());
   const base::DictionaryValue* onc =
       cros_->FindOncForNetwork(network->unique_id());
 
@@ -1356,7 +1358,7 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(
                      new base::FundamentalValue(network->preferred()),
                      property_ui_data);
 
-  chromeos::NetworkPropertyUIData auto_connect_ui_data(ui_data);
+  chromeos::NetworkPropertyUIData auto_connect_ui_data(ui_data.onc_source());
   std::string onc_path_to_auto_connect;
   if (type == chromeos::TYPE_WIFI) {
     onc_path_to_auto_connect = base::StringPrintf(
@@ -1371,7 +1373,7 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(
   }
   if (!onc_path_to_auto_connect.empty()) {
     auto_connect_ui_data.ParseOncProperty(
-        ui_data,
+        ui_data.onc_source(),
         onc,
         onc_path_to_auto_connect);
   }
@@ -1492,7 +1494,7 @@ void InternetOptionsHandler::PopulateCellularDetails(
       cros_->FindNetworkDeviceByPath(cellular->device_path());
   if (device) {
     const chromeos::NetworkPropertyUIData cellular_property_ui_data(
-        cellular->ui_data());
+        cellular->ui_data().onc_source());
     dictionary->SetString(kTagManufacturer, device->manufacturer());
     dictionary->SetString(kTagModelId, device->model_id());
     dictionary->SetString(kTagFirmwareRevision, device->firmware_revision());