Convert all connect code to use NetworkHandler instead of NetworkLibrary

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 6aa894c4b0314d9c08ca21f15e7014c26eb5b17c..5216fa3af9ce165af4236785a61857f7d758c2eb 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -282,15 +282,6 @@ void SetNetworkProperty(const std::string& service_path,
       base::Bind(&ShillError, "SetNetworkProperty"));
 }
 
-const base::DictionaryValue* FindPolicyForActiveUser(
-    const NetworkState* network,
-    onc::ONCSource* onc_source) {
-  const User* user = UserManager::Get()->GetActiveUser();
-  std::string username_hash = user ? user->username_hash() : std::string();
-  return NetworkHandler::Get()->managed_network_configuration_handler()
-      ->FindPolicyByGUID(username_hash, network->guid(), onc_source);
-}
-
 std::string ActivationStateString(const std::string& activation_state) {
   int id;
   if (activation_state == flimflam::kActivationStateActivated)
@@ -657,7 +648,8 @@ void PopulateVPNDetails(const NetworkState* vpn,
   dictionary->SetString(kTagUsername, username);
 
   onc::ONCSource onc_source = onc::ONC_SOURCE_NONE;
-  const base::DictionaryValue* onc = FindPolicyForActiveUser(vpn, &onc_source);
+  const base::DictionaryValue* onc =
+      network_connect::FindPolicyForActiveUser(vpn, &onc_source);
 
   NetworkPropertyUIData hostname_ui_data;
   hostname_ui_data.ParseOncProperty(
@@ -1164,7 +1156,7 @@ void InternetOptionsHandler::CarrierStatusCallback() {
     const NetworkState* network =
         handler->FirstNetworkByType(flimflam::kTypeCellular);
     if (network) {
-      chromeos::network_connect::ActivateCellular(network->path());
+      ash::network_connect::ActivateCellular(network->path());
       UpdateConnectionData(network->path());
     }
   }
@@ -1446,7 +1438,7 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback(
 
   onc::ONCSource onc_source = onc::ONC_SOURCE_NONE;
   const base::DictionaryValue* onc =
-      FindPolicyForActiveUser(network, &onc_source);
+      network_connect::FindPolicyForActiveUser(network, &onc_source);
   const NetworkPropertyUIData property_ui_data(onc_source);
 
   base::DictionaryValue dictionary;
@@ -1691,7 +1683,7 @@ void PopulateCellularDetails(const NetworkState* cellular,
     // caching them (will be done for the new UI).
     const base::DictionaryValue& device_properties = device->properties();
     const NetworkPropertyUIData cellular_property_ui_data(
-        cellular->onc_source());
+        cellular->ui_data().onc_source());
     CopyStringFromDictionary(device_properties, flimflam::kManufacturerProperty,
                             kTagManufacturer, dictionary);
     CopyStringFromDictionary(device_properties, flimflam::kModelIDProperty,
@@ -1849,15 +1841,14 @@ void InternetOptionsHandler::NetworkCommandCallback(
                    weak_factory_.GetWeakPtr()),
         base::Bind(&ShillError, "NetworkCommand: " + command));
   } else if (command == kTagConnect) {
-    network_connect::ConnectToNetwork(
-        service_path, GetNativeWindow());
+    ash::network_connect::ConnectToNetwork(service_path, GetNativeWindow());
   } else if (command == kTagDisconnect) {
     NetworkHandler::Get()->network_connection_handler()->DisconnectNetwork(
         service_path,
         base::Bind(&base::DoNothing),
         base::Bind(&ShillError, "NetworkCommand: " + command));
   } else if (command == kTagActivate && type == flimflam::kTypeCellular) {
-    network_connect::ActivateCellular(service_path);
+    ash::network_connect::ActivateCellular(service_path);
     // Activation may update network properties (e.g. ActivationState), so
     // request them here in case they change.
     UpdateConnectionData(service_path);
@@ -1869,9 +1860,9 @@ void InternetOptionsHandler::NetworkCommandCallback(
 
 void InternetOptionsHandler::AddConnection(const std::string& type) {
   if (type == flimflam::kTypeWifi)
-    NetworkConfigView::ShowForType(chromeos::TYPE_WIFI, GetNativeWindow());
+    NetworkConfigView::ShowForType(flimflam::kTypeWifi, GetNativeWindow());
   else if (type == flimflam::kTypeVPN)
-    NetworkConfigView::ShowForType(chromeos::TYPE_VPN, GetNativeWindow());
+    NetworkConfigView::ShowForType(flimflam::kTypeVPN, GetNativeWindow());
   else if (type == flimflam::kTypeCellular)
     ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
   else