Move NetworkStateNotifier and NetworkConnect from src/ui

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 819a42e9238b477bb5fe7de5964b6ba5245a95e4..6a291bcef8fab0b36fa140038dfe039d727d4466 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -11,11 +11,13 @@
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
+#include "chrome/browser/chromeos/net/shill_error.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_configuration_handler.h"
+#include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_profile_handler.h"
@@ -25,7 +27,6 @@
 #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"
@@ -100,8 +101,8 @@ void WimaxConfigView::UpdateErrorLabel() {
     const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()->
         GetNetworkState(service_path_);
     if (wimax && wimax->connection_state() == shill::kStateFailure)
-      error_msg = ui::NetworkConnect::Get()->GetShillErrorString(
-          wimax->last_error(), wimax->path());
+      error_msg =
+          shill_error::GetShillErrorString(wimax->last_error(), wimax->guid());
   }
   if (!error_msg.empty()) {
     error_label_->SetText(error_msg);
@@ -168,8 +169,8 @@ bool WimaxConfigView::Login() {
                                               false);
   }
 
-  ui::NetworkConnect::Get()->ConfigureNetworkAndConnect(
-      service_path_, properties, share_network);
+  NetworkConnect::Get()->ConfigureNetworkAndConnect(service_path_, properties,
+                                                    share_network);
   return true;  // dialog will be closed
 }