Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/ui/webui/options/chromeos/internet_options_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 "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 19 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/chrome_notification_types.h"
 #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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 453 matching lines @@
     const base::DictionaryValue& onc,
     DictionaryValue* dictionary) {
   dictionary->SetString(kTagService_name, vpn->name());
   bool remembered = (vpn->profile_type() != chromeos::PROFILE_NONE);
   dictionary->SetBoolean(kTagRemembered, remembered);
   dictionary->SetString(kTagProvider_type, vpn->GetProviderTypeString());
   dictionary->SetString(kTagUsername, vpn->username());
 
   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));
   SetValueDictionary(dictionary, kTagServerHostname,
                      new base::StringValue(vpn->server_hostname()),
                      hostname_ui_data);
 }
 
 // Activate the cellular device pointed to by the service path.
 void Activate(std::string service_path) {
@@ skipping 715 matching lines @@
     std::string properties_json;
     base::JSONWriter::WriteWithOptions(shill_properties,
                                        base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                        &properties_json);
     VLOG(2) << "Shill Properties: " << std::endl << properties_json;
   }
   chromeos::Network* network = cros_->FindNetworkByPath(service_path);
   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());
 
   base::DictionaryValue dictionary;
   if (!hardware_address.empty())
     dictionary.SetString(kTagHardwareAddress, hardware_address);
 
   // The DHCP IPConfig contains the values that are actually in use at the
   // moment, even if some are overridden by static IP values.
   scoped_ptr<DictionaryValue> ipconfig_dhcp(new DictionaryValue);
@@ skipping 73 matching lines @@
        CommandLine::ForCurrentProcess()->HasSwitch(
            chromeos::switches::kEnableStaticIPConfig));
   dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
 
   dictionary.SetBoolean(kTagShowPreferred,
                         network_profile == chromeos::PROFILE_USER);
   SetValueDictionary(&dictionary, kTagPreferred,
                      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(
         "%s.%s",
         chromeos::onc::network_config::kWiFi,
         chromeos::onc::wifi::kAutoConnect);
   } else if (type == chromeos::TYPE_VPN) {
     onc_path_to_auto_connect = base::StringPrintf(
         "%s.%s",
         chromeos::onc::network_config::kVPN,
         chromeos::onc::vpn::kAutoConnect);
   }
   if (!onc_path_to_auto_connect.empty()) {
     auto_connect_ui_data.ParseOncProperty(
-        ui_data,
+        ui_data.onc_source(),
         onc,
         onc_path_to_auto_connect);
   }
   SetValueDictionary(&dictionary, kTagAutoConnect,
                      new base::FundamentalValue(network->auto_connect()),
                      auto_connect_ui_data);
 
   PopulateConnectionDetails(network, &dictionary);
   web_ui()->CallJavascriptFunction(
       kShowDetailedInfoFunction, dictionary);
@@ skipping 100 matching lines @@
 
   dictionary->Set(kTagApn, CreateDictionaryFromCellularApn(cellular->apn()));
   dictionary->Set(kTagLastGoodApn,
                   CreateDictionaryFromCellularApn(cellular->last_good_apn()));
 
   // Device settings.
   const chromeos::NetworkDevice* device =
       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());
     dictionary->SetString(kTagHardwareRevision, device->hardware_revision());
     dictionary->SetString(kTagPrlVersion,
                           base::StringPrintf("%u", device->prl_version()));
     dictionary->SetString(kTagMeid, device->meid());
     dictionary->SetString(kTagIccid, device->iccid());
     dictionary->SetString(kTagImei, device->imei());
     dictionary->SetString(kTagMdn, device->mdn());
@@ skipping 357 matching lines @@
 
   dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
   dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
   dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy());
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
   dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
 }
 
 }  // namespace options