Remove all NetworkLibrary dependencies from AutomationTestingProvider

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 140 matching lines @@
 
 AutomationProvider::AutomationProvider(Profile* profile)
     : profile_(profile),
       reply_message_(NULL),
       reinitialize_on_channel_error_(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAutomationReinitializeOnChannelError)),
       use_initial_load_observers_(true),
       is_connected_(false),
       initial_tab_loads_complete_(false),
-      network_library_initialized_(true),
       login_webui_ready_(true) {
   TRACE_EVENT_BEGIN_ETW("AutomationProvider::AutomationProvider", 0, "");
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   browser_tracker_.reset(new AutomationBrowserTracker(this));
   tab_tracker_.reset(new AutomationTabTracker(this));
   window_tracker_.reset(new AutomationWindowTracker(this));
   new_tab_ui_load_observer_.reset(new NewTabUILoadObserver(this, profile));
   metric_event_duration_observer_.reset(new MetricEventDurationObserver());
@@ skipping 43 matching lines @@
 #if defined(OS_CHROMEOS)
   if (use_initial_load_observers_) {
     // Wait for webui login to be ready.
     // Observer will delete itself.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kLoginManager) &&
         !chromeos::LoginState::Get()->IsUserLoggedIn()) {
       login_webui_ready_ = false;
       new OOBEWebuiReadyObserver(this);
     }
-
-    // Wait for the network manager to initialize.
-    // The observer will delete itself when done.
-    network_library_initialized_ = false;
-    NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this);
-    if (!observer->Init())
-      delete observer;
   }
 #endif
 
   TRACE_EVENT_END_ETW("AutomationProvider::InitializeChannel", 0, "");
 
   return true;
 }
 
 IPC::Channel::Mode AutomationProvider::GetChannelMode(
     bool use_named_interface) {
@@ skipping 15 matching lines @@
   else
     initial_load_observer_.reset(new InitialLoadObserver(expected_tabs, this));
 }
 
 void AutomationProvider::OnInitialTabLoadsComplete() {
   initial_tab_loads_complete_ = true;
   VLOG(2) << "OnInitialTabLoadsComplete";
   SendInitialLoadMessage();
 }
 
-void AutomationProvider::OnNetworkLibraryInit() {
-  network_library_initialized_ = true;
-  VLOG(2) << "OnNetworkLibraryInit";
-  SendInitialLoadMessage();
-}
-
 void AutomationProvider::OnOOBEWebuiReady() {
   login_webui_ready_ = true;
   VLOG(2) << "OnOOBEWebuiReady";
   SendInitialLoadMessage();
 }
 
 void AutomationProvider::SendInitialLoadMessage() {
-  if (is_connected_ && initial_tab_loads_complete_ &&
-      network_library_initialized_ && login_webui_ready_) {
+  if (is_connected_ && initial_tab_loads_complete_ && login_webui_ready_) {
     VLOG(2) << "Initial loads complete; sending initial loads message.";
     Send(new AutomationMsg_InitialLoadsComplete());
   }
 }
 
 void AutomationProvider::DisableInitialLoadObservers() {
   use_initial_load_observers_ = false;
   OnInitialTabLoadsComplete();
-  OnNetworkLibraryInit();
   OnOOBEWebuiReady();
 }
 
 int AutomationProvider::GetIndexForNavigationController(
     const NavigationController* controller, const Browser* parent) const {
   DCHECK(parent);
   return parent->tab_strip_model()->GetIndexOfWebContents(
       controller->GetWebContents());
 }
 
@@ skipping 493 matching lines @@
 
   return NULL;
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
   if (web_contents)
     web_contents->OnSavePage();
 }