Move network_connect code to ui/chromeos/network (Take 2)

chrome/browser/chromeos/options/wimax_config_view.cc

Index: chrome/browser/chromeos/options/wimax_config_view.cc
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc
index 92a3cb2ad39a305c4c2d27c54df17d368d84a8e3..d896fcf76e04c2d2270fb0b312b8691832e55c20 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/options/wimax_config_view.h"
 
-#include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -26,6 +25,7 @@
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/chromeos/network/network_connect.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
@@ -101,7 +101,7 @@ void WimaxConfigView::UpdateErrorLabel() {
     const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()->
         GetNetworkState(service_path_);
     if (wimax && wimax->connection_state() == shill::kStateFailure)
-      error_msg = ash::NetworkConnect::Get()->GetErrorString(
+      error_msg = ui::NetworkConnect::Get()->GetErrorString(
           wimax->last_error(), wimax->path());
   }
   if (!error_msg.empty()) {
@@ -168,7 +168,7 @@ bool WimaxConfigView::Login() {
                                               false);
   }
 
-  ash::NetworkConnect::Get()->ConfigureNetworkAndConnect(
+  ui::NetworkConnect::Get()->ConfigureNetworkAndConnect(
       service_path_, properties, share_network);
   return true;  // dialog will be closed
 }