NOT FOR SUBMIT: Remove NetworkLibrary

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 53f45031247ebf41edcda96900004ca48144199c..1596fb35bea3b12576ea8f7bd0f2d35ebbf1326b 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -31,7 +31,6 @@
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/contacts/contact_manager.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
@@ -253,8 +252,7 @@ namespace internal {
 // destructor will get called if and only if this has been instantiated.
 class DBusServices {
  public:
-  explicit DBusServices(const content::MainFunctionParams& parameters)
-      : network_library_initialized_(false) {
+  explicit DBusServices(const content::MainFunctionParams& parameters) {
     if (!base::chromeos::IsRunningOnChromeOS()) {
       // Override this path on the desktop, so that the user policy key can be
       // stored by the stub SessionManagerClient.
@@ -283,17 +281,6 @@ class DBusServices {
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
 
-    // Initialize NetworkLibrary only for the browser, unless running tests
-    // (which do their own NetworkLibrary setup with
-    // ScopedStubNetworkLibraryEnabler in InProcessBrowserTest).
-    if (!parameters.ui_task) {
-      const bool use_stub = !base::chromeos::IsRunningOnChromeOS();
-      NetworkLibrary::Initialize(use_stub);
-      network_library_initialized_ = true;
-    }
-
-    // Always initialize these handlers which should not conflict with
-    // NetworkLibrary.
     NetworkHandler::Initialize();
     CertLibrary::Initialize();
 
@@ -324,8 +311,6 @@ class DBusServices {
   ~DBusServices() {
     CertLibrary::Shutdown();
     NetworkHandler::Shutdown();
-    if (network_library_initialized_)
-      NetworkLibrary::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
@@ -341,8 +326,6 @@ class DBusServices {
   }
 
  private:
-  bool network_library_initialized_;
-
   DISALLOW_COPY_AND_ASSIGN(DBusServices);
 };
 
@@ -622,7 +605,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
 
   // Initialize the network portal detector for Chrome OS. The network
   // portal detector starts to listen for notifications from
-  // NetworkLibrary about changes in the NetworkManager and initiates
+  // NetworkHandler about changes in the NetworkManager and initiates
   // captive portal detection for active networks.
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
   if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) {