Remove all NetworkLibrary dependencies from AutomationTestingProvider

chrome/browser/automation/automation_provider_observers_chromeos.cc

Index: chrome/browser/automation/automation_provider_observers_chromeos.cc
diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index ff954a908f11d558ca75e01c449ddfe85d2b73f8..49f430800e1aa4dd1a39b22a3588218460e85792 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "content/public/browser/notification_service.h"
 
-using chromeos::NetworkLibrary;
 using chromeos::WizardController;
 
 namespace {
@@ -28,36 +27,6 @@ const char kSessionScreenName[] = "session";
 
 }
 
-NetworkManagerInitObserver::NetworkManagerInitObserver(
-    AutomationProvider* automation)
-    : automation_(automation->AsWeakPtr()) {
-}
-
-NetworkManagerInitObserver::~NetworkManagerInitObserver() {
-  NetworkLibrary::Get()->RemoveNetworkManagerObserver(this);
-}
-
-bool NetworkManagerInitObserver::Init() {
-  if (!NetworkLibrary::Get()->IsCros()) {
-    // If the network library is not the production version, don't wait for
-    // the network library to finish initializing, because it'll wait
-    // forever.
-    automation_->OnNetworkLibraryInit();
-    return false;
-  }
-
-  NetworkLibrary::Get()->AddNetworkManagerObserver(this);
-  return true;
-}
-
-void NetworkManagerInitObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
-  if (!obj->wifi_scanning()) {
-    if (automation_)
-      automation_->OnNetworkLibraryInit();
-    delete this;
-  }
-}
-
 OOBEWebuiReadyObserver::OOBEWebuiReadyObserver(AutomationProvider* automation)
     : automation_(automation->AsWeakPtr()) {
   if (WizardController::default_controller() &&
@@ -211,216 +180,3 @@ void ScreenUnlockObserver::OnLoginFailure(const chromeos::LoginFailure& error) {
   }
   delete this;
 }
-
-NetworkScanObserver::NetworkScanObserver(AutomationProvider* automation,
-                                         IPC::Message* reply_message)
-    : automation_(automation->AsWeakPtr()), reply_message_(reply_message) {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->AddNetworkManagerObserver(this);
-}
-
-NetworkScanObserver::~NetworkScanObserver() {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->RemoveNetworkManagerObserver(this);
-}
-
-void NetworkScanObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
-  if (obj->wifi_scanning())
-    return;
-
-  if (automation_) {
-    AutomationJSONReply(automation_.get(), reply_message_.release())
-        .SendSuccess(NULL);
-  }
-  delete this;
-}
-
-ToggleNetworkDeviceObserver::ToggleNetworkDeviceObserver(
-    AutomationProvider* automation, IPC::Message* reply_message,
-    const std::string& device, bool enable)
-    : automation_(automation->AsWeakPtr()), reply_message_(reply_message),
-      device_(device), enable_(enable) {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->AddNetworkManagerObserver(this);
-}
-
-ToggleNetworkDeviceObserver::~ToggleNetworkDeviceObserver() {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->RemoveNetworkManagerObserver(this);
-}
-
-void ToggleNetworkDeviceObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
-  if ((device_ == "ethernet" && enable_ == obj->ethernet_enabled()) ||
-      (device_ == "wifi" && enable_ == obj->wifi_enabled()) ||
-      (device_ == "cellular" && enable_ == obj->cellular_enabled())) {
-    if (automation_) {
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(NULL);
-    }
-    delete this;
-  }
-}
-
-NetworkStatusObserver::NetworkStatusObserver(AutomationProvider* automation,
-                                               IPC::Message* reply_message)
-    : automation_(automation->AsWeakPtr()), reply_message_(reply_message) {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->AddNetworkManagerObserver(this);
-}
-
-NetworkStatusObserver::~NetworkStatusObserver() {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->RemoveNetworkManagerObserver(this);
-}
-
-void NetworkStatusObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
-  const chromeos::Network* network = GetNetwork(obj);
-  if (!network) {
-    // The network was not found, and we assume it no longer exists.
-    // This could be because the ssid is invalid, or the network went away.
-    if (automation_) {
-      scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-      return_value->SetString("error_string", "Network not found.");
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(return_value.get());
-    }
-    delete this;
-    return;
-  }
-
-  NetworkStatusCheck(network);
-}
-
-NetworkConnectObserver::NetworkConnectObserver(
-    AutomationProvider* automation, IPC::Message* reply_message)
-    : NetworkStatusObserver(automation, reply_message) {}
-
-void NetworkConnectObserver::NetworkStatusCheck(const chromeos::Network*
-                                                network) {
-  if (network->failed()) {
-    if (automation_) {
-      scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-      return_value->SetString("error_string", network->GetErrorString());
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(return_value.get());
-    }
-    delete this;
-  } else if (network->connected()) {
-    if (automation_) {
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(NULL);
-    }
-    delete this;
-  }
-
-  // The network is in the NetworkLibrary's list, but there's no failure or
-  // success condition, so just continue waiting for more network events.
-}
-
-NetworkDisconnectObserver::NetworkDisconnectObserver(
-    AutomationProvider* automation, IPC::Message* reply_message,
-    const std::string& service_path)
-    : NetworkStatusObserver(automation, reply_message),
-      service_path_(service_path) {}
-
-void NetworkDisconnectObserver::NetworkStatusCheck(const chromeos::Network*
-                                                   network) {
-  if (!network->connected()) {
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(NULL);
-      delete this;
-  }
-}
-
-const chromeos::Network* NetworkDisconnectObserver::GetNetwork(
-    NetworkLibrary* network_library) {
-  return network_library->FindNetworkByPath(service_path_);
-}
-
-ServicePathConnectObserver::ServicePathConnectObserver(
-    AutomationProvider* automation, IPC::Message* reply_message,
-    const std::string& service_path)
-    : NetworkConnectObserver(automation, reply_message),
-      service_path_(service_path) {}
-
-const chromeos::Network* ServicePathConnectObserver::GetNetwork(
-    NetworkLibrary* network_library) {
-  return network_library->FindNetworkByPath(service_path_);
-}
-
-SSIDConnectObserver::SSIDConnectObserver(
-    AutomationProvider* automation, IPC::Message* reply_message,
-    const std::string& ssid)
-    : NetworkConnectObserver(automation, reply_message), ssid_(ssid) {}
-
-const chromeos::Network* SSIDConnectObserver::GetNetwork(
-    NetworkLibrary* network_library) {
-  const chromeos::WifiNetworkVector& wifi_networks =
-      network_library->wifi_networks();
-  for (chromeos::WifiNetworkVector::const_iterator iter = wifi_networks.begin();
-       iter != wifi_networks.end(); ++iter) {
-    const chromeos::WifiNetwork* wifi = *iter;
-    if (wifi->name() == ssid_)
-      return wifi;
-  }
-  return NULL;
-}
-
-VirtualConnectObserver::VirtualConnectObserver(AutomationProvider* automation,
-                                               IPC::Message* reply_message,
-                                               const std::string& service_name)
-    : automation_(automation->AsWeakPtr()),
-      reply_message_(reply_message),
-      service_name_(service_name) {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->AddNetworkManagerObserver(this);
-}
-
-VirtualConnectObserver::~VirtualConnectObserver() {
-  NetworkLibrary* network_library = NetworkLibrary::Get();
-  network_library->RemoveNetworkManagerObserver(this);
-}
-
-void VirtualConnectObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
-  const chromeos::VirtualNetwork* virt = GetVirtualNetwork(cros);
-  if (!virt) {
-    // The network hasn't been added to the NetworkLibrary's list yet,
-    // just continue waiting for more network events.
-    return;
-  }
-
-  if (virt->failed()) {
-    if (automation_) {
-      scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-      return_value->SetString("error_string", virt->GetErrorString());
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(return_value.get());
-    }
-    delete this;
-  } else if (virt->connected()) {
-    if (automation_) {
-      AutomationJSONReply(automation_.get(), reply_message_.release())
-          .SendSuccess(NULL);
-    }
-    delete this;
-  }
-  // The network is in the NetworkLibrary's list, but there's no failure or
-  // success condition, so just continue waiting for more network events.
-}
-
-chromeos::VirtualNetwork* VirtualConnectObserver::GetVirtualNetwork(
-    const chromeos::NetworkLibrary* cros) {
-  chromeos::VirtualNetwork* virt = NULL;
-  const chromeos::VirtualNetworkVector& virtual_networks =
-      cros->virtual_networks();
-
-  for (chromeos::VirtualNetworkVector::const_iterator iter =
-       virtual_networks.begin(); iter != virtual_networks.end(); ++iter) {
-    chromeos::VirtualNetwork* v = *iter;
-    if (v->name() == service_name_) {
-      virt = v;
-      break;
-    }
-  }
-  return virt;
-}