PyAuto automation hooks: blocking wifi connect, disconnect, and network scan.

chrome/browser/automation/automation_provider_observers.cc

Index: chrome/browser/automation/automation_provider_observers.cc
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 8f5fc1f0a0faa8dfa104e04eff27a831ca1bd7bd..24a3f0b061dea127de935c55bc7e535fcdbfcc3f 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -24,10 +24,6 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/login/authentication_notification_details.h"
-#endif  // defined(OS_CHROMEOS)
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/save_package.h"
@@ -153,31 +149,6 @@ void InitialLoadObserver::ConditionMet() {
     automation_->OnInitialTabLoadsComplete();
 }
 
-#if defined(OS_CHROMEOS)
-NetworkManagerInitObserver::NetworkManagerInitObserver(
-    AutomationProvider* automation)
-    : automation_(automation->AsWeakPtr()) {
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
-        AddNetworkManagerObserver(this);
-  } else {
-    automation_->OnNetworkLibraryInit();
-    delete this;
-  }
-}
-
-NetworkManagerInitObserver::~NetworkManagerInitObserver() {}
-
-void NetworkManagerInitObserver::OnNetworkManagerChanged(
-    chromeos::NetworkLibrary* obj) {
-  if (!obj->wifi_scanning()) {
-    obj->RemoveNetworkManagerObserver(this);
-    automation_->OnNetworkLibraryInit();
-    delete this;
-  }
-}
-#endif  // defined(OS_CHROMEOS)
-
 NewTabUILoadObserver::NewTabUILoadObserver(AutomationProvider* automation)
     : automation_(automation->AsWeakPtr()) {
   registrar_.Add(this, NotificationType::INITIAL_NEW_TAB_UI_LOAD,
@@ -1259,66 +1230,6 @@ void InfoBarCountObserver::CheckCount() {
   delete this;
 }
 
-#if defined(OS_CHROMEOS)
-LoginManagerObserver::LoginManagerObserver(
-    AutomationProvider* automation,
-    IPC::Message* reply_message)
-    : automation_(automation->AsWeakPtr()),
-      reply_message_(reply_message) {
-
-  registrar_.Add(this, NotificationType::LOGIN_USER_CHANGED,
-                 NotificationService::AllSources());
-}
-
-LoginManagerObserver::~LoginManagerObserver() {}
-
-void LoginManagerObserver::Observe(NotificationType type,
-                                   const NotificationSource& source,
-                                   const NotificationDetails& details) {
-  DCHECK(type == NotificationType::LOGIN_USER_CHANGED);
-
-  if (!automation_) {
-    delete this;
-    return;
-  }
-
-  AutomationJSONReply reply(automation_, reply_message_.release());
-  Details<AuthenticationNotificationDetails> auth_details(details);
-  if (auth_details->success())
-    reply.SendSuccess(NULL);
-  else
-    reply.SendError("Login failure.");
-  delete this;
-}
-
-ScreenLockUnlockObserver::ScreenLockUnlockObserver(
-    AutomationProvider* automation,
-    IPC::Message* reply_message,
-    bool lock_screen)
-    : automation_(automation),
-      reply_message_(reply_message),
-      lock_screen_(lock_screen) {
-
-  registrar_.Add(this, NotificationType::SCREEN_LOCK_STATE_CHANGED,
-                 NotificationService::AllSources());
-}
-
-ScreenLockUnlockObserver::~ScreenLockUnlockObserver() {}
-
-void ScreenLockUnlockObserver::Observe(NotificationType type,
-                                       const NotificationSource& source,
-                                       const NotificationDetails& details) {
-  DCHECK(type == NotificationType::SCREEN_LOCK_STATE_CHANGED);
-  AutomationJSONReply reply(automation_, reply_message_);
-  bool is_screen_locked = *Details<bool>(details).ptr();
-  if (lock_screen_ == is_screen_locked)
-    reply.SendSuccess(NULL);
-  else
-    reply.SendError("Screen lock failure.");
-  delete this;
-}
-#endif  // defined(OS_CHROMEOS)
-
 AutomationProviderBookmarkModelObserver::
 AutomationProviderBookmarkModelObserver(
     AutomationProvider* provider,