cros_library: Remove CrosLibrary

CrosLibray was just wrapping NetworkLibrary. This patch is essentially
a global replace of the following:

  CrosLibrary::Get()->GetNetworkLibrary() -> NetworkLibrary::Get()

CrosLibrary::Initialize/Shutdown/etc are replaced with
NetworkLibrary::Initialize/Shutdown/etc.

BUG=126719
TEST=networking works as before on the chromebook
TBR=hashimoto@chromium.org
# for some non-chromeos files under chrome/browser

Review URL: https://codereview.chromium.org/19340002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211912 0039d316-1c4b-4281-b951-d872f2087c98

40 files changed, 186 insertions, 283 deletions

diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index fb5efff..3f973ee 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -7,7 +7,6 @@
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ -19,7 +18,6 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "content/public/browser/notification_service.h"
 
-using chromeos::CrosLibrary;
 using chromeos::NetworkLibrary;
 using chromeos::WizardController;
 
@@ -36,11 +34,11 @@ NetworkManagerInitObserver::NetworkManagerInitObserver(
 }
 
 NetworkManagerInitObserver::~NetworkManagerInitObserver() {
-    CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  NetworkLibrary::Get()->RemoveNetworkManagerObserver(this);
 }
 
 bool NetworkManagerInitObserver::Init() {
-  if (!CrosLibrary::Get()->GetNetworkLibrary()->IsCros()) {
+  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.
@@ -48,7 +46,7 @@ bool NetworkManagerInitObserver::Init() {
     return false;
   }
 
-  CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
+  NetworkLibrary::Get()->AddNetworkManagerObserver(this);
   return true;
 }
 
@@ -217,12 +215,12 @@ void ScreenUnlockObserver::OnLoginFailure(const chromeos::LoginFailure& error) {
 NetworkScanObserver::NetworkScanObserver(AutomationProvider* automation,
                                          IPC::Message* reply_message)
     : automation_(automation->AsWeakPtr()), reply_message_(reply_message) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->AddNetworkManagerObserver(this);
 }
 
 NetworkScanObserver::~NetworkScanObserver() {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->RemoveNetworkManagerObserver(this);
 }
 
@@ -242,12 +240,12 @@ ToggleNetworkDeviceObserver::ToggleNetworkDeviceObserver(
     const std::string& device, bool enable)
     : automation_(automation->AsWeakPtr()), reply_message_(reply_message),
       device_(device), enable_(enable) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->AddNetworkManagerObserver(this);
 }
 
 ToggleNetworkDeviceObserver::~ToggleNetworkDeviceObserver() {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->RemoveNetworkManagerObserver(this);
 }
 
@@ -266,12 +264,12 @@ void ToggleNetworkDeviceObserver::OnNetworkManagerChanged(NetworkLibrary* obj) {
 NetworkStatusObserver::NetworkStatusObserver(AutomationProvider* automation,
                                                IPC::Message* reply_message)
     : automation_(automation->AsWeakPtr()), reply_message_(reply_message) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->AddNetworkManagerObserver(this);
 }
 
 NetworkStatusObserver::~NetworkStatusObserver() {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->RemoveNetworkManagerObserver(this);
 }
 
@@ -374,12 +372,12 @@ VirtualConnectObserver::VirtualConnectObserver(AutomationProvider* automation,
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       service_name_(service_name) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->AddNetworkManagerObserver(this);
 }
 
 VirtualConnectObserver::~VirtualConnectObserver() {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->RemoveNetworkManagerObserver(this);
 }
 
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 885b64f..a528098 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
@@ -53,7 +52,6 @@
 #include "policy/policy_constants.h"
 #include "ui/views/widget/widget.h"
 
-using chromeos::CrosLibrary;
 using chromeos::DBusThreadManager;
 using chromeos::ExistingUserController;
 using chromeos::NetworkLibrary;
@@ -524,7 +522,7 @@ void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
 void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args,
                                                IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
 
   return_value->SetBoolean("offline_mode",
                            net::NetworkChangeNotifier::IsOffline());
@@ -625,7 +623,7 @@ void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args,
 
 void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
                                             IPC::Message* reply_message) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   network_library->RequestNetworkScan();
 
   // Set up an observer (it will delete itself).
@@ -646,7 +644,7 @@ void TestingAutomationProvider::ToggleNetworkDevice(
   // Set up an observer (it will delete itself).
   new ToggleNetworkDeviceObserver(this, reply_message, device, enable);
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   if (device == "ethernet") {
     network_library->EnableEthernetNetworkDevice(enable);
   } else if (device == "wifi") {
@@ -715,7 +713,7 @@ void TestingAutomationProvider::ConnectToCellularNetwork(
     return;
   }
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   chromeos::CellularNetwork* cellular =
       network_library->FindCellularNetworkByPath(service_path);
   if (!cellular) {
@@ -733,7 +731,7 @@ void TestingAutomationProvider::ConnectToCellularNetwork(
 
 void TestingAutomationProvider::DisconnectFromCellularNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   const chromeos::CellularNetwork* cellular =
         network_library->cellular_network();
   if (!cellular) {
@@ -760,7 +758,7 @@ void TestingAutomationProvider::ConnectToWifiNetwork(
     return;
   }
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   chromeos::WifiNetwork* wifi =
       network_library->FindWifiNetworkByPath(service_path);
   if (!wifi) {
@@ -791,7 +789,7 @@ void TestingAutomationProvider::ForgetWifiNetwork(
     return;
   }
 
-  CrosLibrary::Get()->GetNetworkLibrary()->ForgetNetwork(service_path);
+  NetworkLibrary::Get()->ForgetNetwork(service_path);
   AutomationJSONReply(this, reply_message).SendSuccess(NULL);
 }
 
@@ -823,7 +821,7 @@ void TestingAutomationProvider::ConnectToHiddenWifiNetwork(
   chromeos::ConnectionSecurity connection_security =
       connection_security_map[security];
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
 
   // Set up an observer (it will delete itself).
   new SSIDConnectObserver(this, reply_message, ssid);
@@ -890,7 +888,7 @@ void TestingAutomationProvider::ConnectToHiddenWifiNetwork(
 void TestingAutomationProvider::DisconnectFromWifiNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   const chromeos::WifiNetwork* wifi = network_library->wifi_network();
   if (!wifi) {
     reply.SendError("Not connected to any wifi network.");
@@ -915,7 +913,7 @@ void TestingAutomationProvider::AddPrivateNetwork(
     return;
   }
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
 
   // Attempt to connect to the VPN based on the provider type.
   if (provider_type == VPNProviderTypeToString(
@@ -987,7 +985,7 @@ void TestingAutomationProvider::ConnectToPrivateNetwork(
 
   // Connect to a remembered VPN by its service_path. Valid service_paths
   // can be found in the dictionary returned by GetPrivateNetworkInfo.
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   chromeos::VirtualNetwork* network =
       network_library->FindVirtualNetworkByPath(service_path);
   if (!network) {
@@ -1008,7 +1006,7 @@ void TestingAutomationProvider::ConnectToPrivateNetwork(
 void TestingAutomationProvider::GetPrivateNetworkInfo(
     DictionaryValue* args, IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   const chromeos::VirtualNetworkVector& virtual_networks =
       network_library->virtual_networks();
 
@@ -1038,7 +1036,7 @@ void TestingAutomationProvider::GetPrivateNetworkInfo(
 void TestingAutomationProvider::DisconnectFromPrivateNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   const chromeos::VirtualNetwork* virt = network_library->virtual_network();
   if (!virt) {
     reply.SendError("Not connected to any virtual network.");
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 28018f1..9d7097f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -33,7 +33,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/cros_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"
@@ -260,7 +259,7 @@ namespace internal {
 class DBusServices {
  public:
   explicit DBusServices(const content::MainFunctionParams& parameters)
-      : cros_initialized_(false) {
+      : network_library_initialized_(false) {
     if (!base::chromeos::IsRunningOnChromeOS()) {
       // Override this path on the desktop, so that the user policy key can be
       // stored by the stub SessionManagerClient.
@@ -288,13 +287,13 @@ class DBusServices {
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
 
-    // Initialize CrosLibrary only for the browser, unless running tests
-    // (which do their own CrosLibrary setup with ScopedStubCrosEnabler in
-    // InProcessBrowserTest).
+    // 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();
-      CrosLibrary::Initialize(use_stub);
-      cros_initialized_ = true;
+      NetworkLibrary::Initialize(use_stub);
+      network_library_initialized_ = true;
     }
 
     // Always initialize these handlers which should not conflict with
@@ -337,8 +336,8 @@ class DBusServices {
 
     CertLibrary::Shutdown();
     NetworkHandler::Shutdown();
-    if (cros_initialized_)
-      CrosLibrary::Shutdown();
+    if (network_library_initialized_)
+      NetworkLibrary::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
@@ -354,7 +353,7 @@ class DBusServices {
   }
 
  private:
-  bool cros_initialized_;
+  bool network_library_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusServices);
 };
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
index b9e27bc..e83174f 100644
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
+++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.cc
@@ -29,7 +29,7 @@ void CrosInProcessBrowserTest::InitStatusAreaMocks() {
   if (mock_network_library_)
     return;
   mock_network_library_ = new StrictMock<MockNetworkLibrary>();
-  CrosLibrary::Get()->SetNetworkLibrary(mock_network_library_);
+  NetworkLibrary::SetForTesting(mock_network_library_);
 }
 
 void CrosInProcessBrowserTest::SetStatusAreaMocksExpectations() {
@@ -165,8 +165,7 @@ void CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture() {
 
 void CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture() {
   // Prevent bogus gMock leak check from firing.
-  if (mock_network_library_)
-    CrosLibrary::Get()->SetNetworkLibrary(NULL);
+  NetworkLibrary::Shutdown();
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h b/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
index a9867ff..f75a973 100644
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
+++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
@@ -34,7 +34,7 @@ class CrosInProcessBrowserTest : public InProcessBrowserTest {
   // Once such expectation is used it won't block expectations you've defined.
   void SetStatusAreaMocksExpectations();
 
-  // Destroyed by CrosLibrary class.
+  // Destroyed by NetworkLibrary::Shutdown().
   MockNetworkLibrary* mock_network_library_;
 
   // Stuff used for mock_network_library_.
diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
deleted file mode 100644
index 668bffa..0000000
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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/chromeos/cros/cros_library.h"
-
-#include "chrome/browser/chromeos/cros/network_library.h"
-
-namespace chromeos {
-
-static CrosLibrary* g_cros_library = NULL;
-
-CrosLibrary::CrosLibrary(bool use_stub) : use_stub_impl_(use_stub) {}
-
-CrosLibrary::~CrosLibrary() {
-}
-
-// static
-void CrosLibrary::Initialize(bool use_stub) {
-  CHECK(!g_cros_library) << "CrosLibrary: Multiple calls to Initialize().";
-  g_cros_library = new CrosLibrary(use_stub);
-  VLOG_IF(1, use_stub) << "CrosLibrary Initialized with Stub Impl.";
-}
-
-// static
-void CrosLibrary::Shutdown() {
-  CHECK(g_cros_library) << "CrosLibrary::Shutdown() called with NULL library";
-  VLOG(1) << "CrosLibrary Shutting down...";
-  delete g_cros_library;
-  g_cros_library = NULL;
-  VLOG(1) << "  CrosLibrary Shutdown completed.";
-}
-
-// static
-CrosLibrary* CrosLibrary::Get() {
-  return g_cros_library;
-}
-
-NetworkLibrary* CrosLibrary::GetNetworkLibrary() {
-  if (!network_library_)
-    network_library_.reset(NetworkLibrary::GetImpl(use_stub_impl_));
-  return network_library_.get();
-}
-
-void CrosLibrary::SetNetworkLibrary(NetworkLibrary* library) {
-  if (network_library_)
-    network_library_.reset();
-  network_library_.reset(library);
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
deleted file mode 100644
index fc5cebc..0000000
--- a/chrome/browser/chromeos/cros/cros_library.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
-
-#include <string>
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-
-namespace chromeos {
-
-class NetworkLibrary;
-
-// This class handles access to sub-parts of ChromeOS library. it provides
-// a level of indirection so individual libraries that it exposes can
-// be mocked for testing.
-class CrosLibrary {
- public:
-  // Sets the global instance. Must be called before any calls to Get().
-  static void Initialize(bool use_stub);
-
-  // Destroys the global instance. Must be called before AtExitManager is
-  // destroyed to ensure a clean shutdown.
-  static void Shutdown();
-
-  // Gets the global instance. Returns NULL if Initialize() has not been
-  // called (or Shutdown() has been called).
-  static CrosLibrary* Get();
-
-  // Gets the network library. The network library is created if it's not yet
-  // created.
-  NetworkLibrary* GetNetworkLibrary();
-
-  // Sets the network library to be returned from GetNetworkLibrary().
-  // CrosLibrary will take the ownership. The existing network library will
-  // be deleted. Passing NULL will just delete the existing network library.
-  void SetNetworkLibrary(NetworkLibrary* network_library);
-
- private:
-  explicit CrosLibrary(bool use_stub);
-  virtual ~CrosLibrary();
-
-  scoped_ptr<NetworkLibrary> network_library_;
-
-  // Stub implementations of the libraries should be used.
-  bool use_stub_impl_;
-
-  DISALLOW_COPY_AND_ASSIGN(CrosLibrary);
-};
-
-// The class is used for enabling the stub libcros, and cleaning it up at
-// the end of the object lifetime. Useful for testing.
-class ScopedStubCrosEnabler {
- public:
-  ScopedStubCrosEnabler() {
-    chromeos::CrosLibrary::Initialize(true);
-  }
-
-  ~ScopedStubCrosEnabler() {
-    chromeos::CrosLibrary::Shutdown();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopedStubCrosEnabler);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index 97448e9..2980a8b 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -11,7 +11,6 @@
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversion_utils.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h"
@@ -90,9 +89,10 @@ using content::BrowserThread;
 
 namespace chromeos {
 
-// Local constants.
 namespace {
 
+static NetworkLibrary* g_network_library = NULL;
+
 // Default value of the SIM unlock retries count. It is updated to the real
 // retries count once cellular device with SIM card is initialized.
 // If cellular device doesn't have SIM card, then retries are never used.
@@ -512,7 +512,7 @@ void Network::InitIPAddressCallback(
     const NetworkIPConfigVector& ip_configs,
     const std::string& hardware_address) {
   Network* network =
-      CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(service_path);
+      NetworkLibrary::Get()->FindNetworkByPath(service_path);
   if (!network)
     return;
   for (size_t i = 0; i < ip_configs.size(); ++i) {
@@ -1365,4 +1365,32 @@ NetworkLibrary* NetworkLibrary::GetImpl(bool stub) {
   return impl;
 }
 
+// static
+void NetworkLibrary::Initialize(bool use_stub) {
+  CHECK(!g_network_library)
+      << "NetworkLibrary: Multiple calls to Initialize().";
+  g_network_library = NetworkLibrary::GetImpl(use_stub);
+  VLOG_IF(1, use_stub) << "NetworkLibrary Initialized with Stub Impl.";
+}
+
+// static
+void NetworkLibrary::Shutdown() {
+  VLOG(1) << "NetworkLibrary Shutting down...";
+  delete g_network_library;
+  g_network_library = NULL;
+  VLOG(1) << "  NetworkLibrary Shutdown completed.";
+}
+
+// static
+NetworkLibrary* NetworkLibrary::Get() {
+  return g_network_library;
+}
+
+// static
+void NetworkLibrary::SetForTesting(NetworkLibrary* library) {
+  if (g_network_library)
+    delete g_network_library;
+  g_network_library = library;
+}
+
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 13dadca..ba7a6d3 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -1178,7 +1178,7 @@ typedef std::vector<CellTower> CellTowerVector;
 
 // This class handles the interaction with the ChromeOS network library APIs.
 // Classes can add themselves as observers. Users can get an instance of the
-// library like this: chromeos::CrosLibrary::Get()->GetNetworkLibrary()
+// library like this: chromeos::NetworkLibrary::Get()
 class NetworkLibrary {
  public:
   enum HardwareAddressFormat {
@@ -1570,8 +1570,39 @@ class NetworkLibrary {
                                 const std::string& service_path) = 0;
 
   // Factory function, creates a new instance and returns ownership.
-  // For normal usage, access the singleton via CrosLibrary::Get().
+  // For normal usage, access the singleton via NetworkLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
+
+  // Initializes the global instance.
+  static void Initialize(bool use_stub);
+
+  // Destroys the global instance. Must be called before AtExitManager is
+  // destroyed to ensure a clean shutdown.
+  static void Shutdown();
+
+  // Gets the global instance. Returns NULL if Initialize() has not been
+  // called (or Shutdown() has been called).
+  static NetworkLibrary* Get();
+
+  // Sets the network library to be returned from Get(). The existing network
+  // library will be deleted.
+  static void SetForTesting(NetworkLibrary* network_library);
+};
+
+// The class is used for enabling the stub libcros, and cleaning it up at
+// the end of the object lifetime. Useful for testing.
+class ScopedStubNetworkLibraryEnabler {
+ public:
+  ScopedStubNetworkLibraryEnabler() {
+    NetworkLibrary::Initialize(true);
+  }
+
+  ~ScopedStubNetworkLibraryEnabler() {
+    NetworkLibrary::Shutdown();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ScopedStubNetworkLibraryEnabler);
 };
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/network_library_unittest.cc b/chrome/browser/chromeos/cros/network_library_unittest.cc
index 2ba7361..6f3731a 100644
--- a/chrome/browser/chromeos/cros/network_library_unittest.cc
+++ b/chrome/browser/chromeos/cros/network_library_unittest.cc
@@ -14,7 +14,6 @@
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -138,8 +137,7 @@ class NetworkLibraryStubTest : public ::testing::Test {
 
  protected:
   virtual void SetUp() {
-    cros_ = static_cast<NetworkLibraryImplStub*>(
-        CrosLibrary::Get()->GetNetworkLibrary());
+    cros_ = static_cast<NetworkLibraryImplStub*>(NetworkLibrary::Get());
     ASSERT_TRUE(cros_) << "GetNetworkLibrary() Failed!";
   }
 
@@ -197,7 +195,7 @@ class NetworkLibraryStubTest : public ::testing::Test {
     }
   }
 
-  ScopedStubCrosEnabler cros_stub_;
+  ScopedStubNetworkLibraryEnabler cros_stub_;
   NetworkLibraryImplStub* cros_;
 
  protected:
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index 8bd78aa..44db705 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -5,13 +5,11 @@
 #include "chrome/browser/chromeos/extensions/info_private_api.h"
 
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 
-using chromeos::CrosLibrary;
 using chromeos::NetworkLibrary;
 
 namespace extensions {
@@ -66,7 +64,7 @@ base::Value* ChromeosInfoPrivateGetFunction::GetValue(
     provider->GetMachineStatistic(chromeos::system::kHardwareClass, &hwid);
     return new base::StringValue(hwid);
   } else if (property_name == kPropertyHomeProvider) {
-    NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* netlib = NetworkLibrary::Get();
     return new base::StringValue(netlib->GetCellularHomeCarrierId());
   } else if (property_name == kPropertyInitialLocale) {
     return new base::StringValue(
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 1748782..7bb9ba7 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -17,7 +17,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
@@ -509,7 +509,7 @@ class LoginUtilsTest : public testing::Test,
   }
 
  protected:
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
 
   base::Closure fake_io_thread_work_;
   base::WaitableEvent fake_io_thread_completion_;
@@ -736,4 +736,4 @@ INSTANTIATE_TEST_CASE_P(
 
 }  // namespace
 
-}
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
index 5417931..3cab6ed 100644
--- a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
+++ b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/merge_session_load_page.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -81,7 +81,7 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
   }
 
  private:
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   ScopedTestDeviceSettingsService test_device_settings_service_;
   ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc
index 81a7f3d..84abe44 100644
--- a/chrome/browser/chromeos/login/online_attempt_unittest.cc
+++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
@@ -85,8 +85,8 @@ class OnlineAttemptTest : public testing::Test {
   scoped_ptr<MockAuthAttemptStateResolver> resolver_;
   scoped_ptr<OnlineAttempt> attempt_;
 
-  // Initializes / shuts down a stub CrosLibrary.
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  // Initializes / shuts down a stub NetworkLibrary.
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
 };
 
 TEST_F(OnlineAttemptTest, LoginSuccess) {
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index 4498e3f..71e8041 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -208,11 +208,10 @@ class ParallelAuthenticatorTest : public testing::Test {
   std::string username_hash_;
   std::string hash_ascii_;
 
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   ScopedDeviceSettingsTestHelper device_settings_test_helper_;
   ScopedTestCrosSettings test_cros_settings_;
 
-  // Mocks, destroyed by CrosLibrary class.
   ScopedUserManagerEnabler user_manager_enabler_;
 
   scoped_ptr<MockCryptohomeLibrary> mock_cryptohome_library_;
diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc
index e2c4773..cb3ca08 100644
--- a/chrome/browser/chromeos/login/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
@@ -136,7 +136,7 @@ class UserManagerTest : public testing::Test {
   scoped_ptr<TestingPrefServiceSimple> local_state_;
 
   ScopedTestDeviceSettingsService test_device_settings_service_;
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   ScopedTestCrosSettings test_cros_settings_;
 
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc
index db658b1..5167f5e 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc
@@ -24,7 +24,6 @@
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
@@ -165,7 +164,7 @@ MobileActivator* MobileActivator::GetInstance() {
 
 void MobileActivator::TerminateActivation() {
   // We're exiting; don't continue with termination.
-  if (!CrosLibrary::Get())
+  if (!NetworkLibrary::Get())
     return;
 
   state_duration_timer_.Stop();
@@ -962,7 +961,7 @@ bool MobileActivator::GotActivationError(
 void MobileActivator::GetDeviceInfo(CellularNetwork* network,
                                     DictionaryValue* value) {
   DCHECK(network);
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (!cros)
     return;
   value->SetString("carrier", network->name());
@@ -984,7 +983,7 @@ std::string MobileActivator::GetErrorMessage(const std::string& code) const {
 }
 
 NetworkLibrary* MobileActivator::GetNetworkLibrary() const {
-  return CrosLibrary::Get()->GetNetworkLibrary();
+  return NetworkLibrary::Get();
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/net/connectivity_state_helper.cc b/chrome/browser/chromeos/net/connectivity_state_helper.cc
index 19ca149..59c626b 100644
--- a/chrome/browser/chromeos/net/connectivity_state_helper.cc
+++ b/chrome/browser/chromeos/net/connectivity_state_helper.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
@@ -202,7 +201,7 @@ void ConnectivityStateHelperImpl::DefaultNetworkChanged(
 //
 
 ConnectivityStateHelperNetworkLibrary::ConnectivityStateHelperNetworkLibrary() {
-  network_library_ = CrosLibrary::Get()->GetNetworkLibrary();
+  network_library_ = NetworkLibrary::Get();
   network_library_->AddNetworkManagerObserver(this);
 }
 
diff --git a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
index 527ac02..d221b66 100644
--- a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
+++ b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/dns/dns_config_service_posix.h"
@@ -25,7 +24,7 @@ bool IsOnline(chromeos::ConnectionState state) {
          state == chromeos::STATE_PORTAL;
 }
 
-}
+}  // namespace
 
 namespace chromeos {
 
@@ -68,7 +67,7 @@ NetworkChangeNotifierNetworkLibrary::~NetworkChangeNotifierNetworkLibrary() {
 
 void NetworkChangeNotifierNetworkLibrary::Init() {
   chromeos::NetworkLibrary* network_library =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   network_library->AddNetworkManagerObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
 
@@ -84,11 +83,11 @@ void NetworkChangeNotifierNetworkLibrary::Shutdown() {
 
   dns_config_service_.reset();
 
-  if (!chromeos::CrosLibrary::Get())
+  if (!NetworkLibrary::Get())
     return;
 
   chromeos::NetworkLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
 
@@ -289,8 +288,7 @@ void NetworkChangeNotifierNetworkLibrary::ReportConnectionChangeOnUIThread() {
 // static
 void NetworkChangeNotifierNetworkLibrary::UpdateInitialState(
     NetworkChangeNotifierNetworkLibrary* self) {
-  chromeos::NetworkLibrary* net =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+  chromeos::NetworkLibrary* net = chromeos::NetworkLibrary::Get();
   self->UpdateNetworkState(net);
 }
 
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index 2992064..d752d1d 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -14,7 +14,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ -195,12 +194,12 @@ void OfflineLoadPage::OnConnectionTypeChanged(
 }
 
 bool OfflineLoadPage::ShowActivationMessage() {
-  CrosLibrary* cros = CrosLibrary::Get();
-  if (!cros || !cros->GetNetworkLibrary()->cellular_available())
+  NetworkLibrary* network_library = NetworkLibrary::Get();
+  if (!network_library || !network_library->cellular_available())
     return false;
 
   const CellularNetworkVector& cell_networks =
-      cros->GetNetworkLibrary()->cellular_networks();
+      network_library->cellular_networks();
   for (size_t i = 0; i < cell_networks.size(); ++i) {
     chromeos::ActivationState activation_state =
         cell_networks[i]->activation_state();
diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
index 52b0e7c..b0b4bec 100644
--- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/offline/offline_load_page.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/interstitial_page.h"
@@ -85,8 +85,8 @@ class OfflineLoadPageTest : public ChromeRenderViewHostTestHarness {
 
   UserResponse user_response_;
 
-  // Initializes / shuts down a stub CrosLibrary.
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  // Initializes / shuts down a stub NetworkLibrary.
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
 };
 
 void TestOfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
diff --git a/chrome/browser/chromeos/options/network_connect.cc b/chrome/browser/chromeos/options/network_connect.cc
index 4daccc2..c44822b 100644
--- a/chrome/browser/chromeos/options/network_connect.cc
+++ b/chrome/browser/chromeos/options/network_connect.cc
@@ -12,7 +12,6 @@
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
@@ -34,7 +33,7 @@ namespace network_connect {
 namespace {
 
 void DoConnect(Network* network, gfx::NativeWindow parent_window) {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (network->type() == TYPE_VPN) {
     VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
     if (vpn->NeedMoreInfoToConnect()) {
@@ -80,7 +79,7 @@ void DoConnect(Network* network, gfx::NativeWindow parent_window) {
 
 void ActivateCellular(const std::string& service_path) {
   chromeos::NetworkLibrary* cros =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   if (!cros->CellularDeviceUsesDirectActivation()) {
     // For non direct activation, show the mobile setup dialog which can be
     // used to activate the network.
@@ -97,7 +96,7 @@ void ActivateCellular(const std::string& service_path) {
 }
 
 void ShowMobileSetup(const std::string& service_path) {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   const CellularNetwork* cellular =
       cros->FindCellularNetworkByPath(service_path);
   if (cellular && !cellular->activated() &&
@@ -130,7 +129,7 @@ ConnectResult ConnectToNetwork(const std::string& service_path,
     return CONNECT_STARTED;
   }
 
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   Network* network = cros->FindNetworkByPath(service_path);
   if (!network)
     return NETWORK_NOT_FOUND;
@@ -172,7 +171,7 @@ ConnectResult ConnectToNetwork(const std::string& service_path,
 
 void HandleUnconfiguredNetwork(const std::string& service_path,
                                gfx::NativeWindow parent_window) {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   Network* network = cros->FindNetworkByPath(service_path);
   if (!network) {
     LOG(WARNING) << "Unknown network: " << service_path;
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index f35536e..943e781 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -7,7 +7,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -302,7 +301,7 @@ void VPNConfigView::OnCertificatesLoaded(bool initial_load) {
 }
 
 bool VPNConfigView::Login() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (service_path_.empty()) {
     NetworkLibrary::VPNConfigData config_data;
     switch (provider_type_) {
@@ -715,7 +714,7 @@ void VPNConfigView::Init(VirtualNetwork* vpn) {
 }
 
 void VPNConfigView::Refresh() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
 
   UpdateControls();
 
@@ -819,7 +818,7 @@ void VPNConfigView::UpdateControls() {
 }
 
 void VPNConfigView::UpdateErrorLabel() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
 
   // Error message.
   std::string error_msg;
@@ -901,7 +900,7 @@ void VPNConfigView::ParseVPNUIProperty(NetworkPropertyUIData* property_ui_data,
                                        Network* network,
                                        const std::string& dict_key,
                                        const std::string& key) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   const base::DictionaryValue* onc =
       network_library->FindOncForNetwork(network->unique_id());
   VLOG_IF(1, !onc) << "No ONC found for VPN network " << network->unique_id();
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 4e7257d..b2338e7 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -7,7 +7,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -569,7 +568,7 @@ void WifiConfigView::UpdateErrorLabel() {
     }
   }
   if (error_msg.empty() && !service_path_.empty()) {
-    NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* cros = NetworkLibrary::Get();
     const WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path_);
     if (wifi && wifi->failed()) {
       bool passphrase_empty = wifi->GetPassphrase().empty();
@@ -652,7 +651,7 @@ void WifiConfigView::OnCertificatesLoaded(bool initial_load) {
 }
 
 bool WifiConfigView::Login() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (service_path_.empty()) {
     const bool share_default = true;  // share networks by default
     if (!eap_method_combobox_) {
@@ -1247,7 +1246,7 @@ void WifiConfigView::ParseWiFiUIProperty(
     NetworkPropertyUIData* property_ui_data,
     Network* network,
     const std::string& key) {
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_library = NetworkLibrary::Get();
   property_ui_data->ParseOncProperty(
       network->ui_data().onc_source(),
       network_library->FindOncForNetwork(network->unique_id()),
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc
index d1260dd..5ae075b 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -7,7 +7,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ -79,7 +78,7 @@ void WimaxConfigView::UpdateDialogButtons() {
 void WimaxConfigView::UpdateErrorLabel() {
   std::string error_msg;
   if (!service_path_.empty()) {
-    NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* cros = NetworkLibrary::Get();
     const WimaxNetwork* wimax = cros->FindWimaxNetworkByPath(service_path_);
     if (wimax && wimax->failed()) {
       bool passphrase_empty = wimax->eap_passphrase().empty();
@@ -138,7 +137,7 @@ void WimaxConfigView::ButtonPressed(views::Button* sender,
 }
 
 bool WimaxConfigView::Login() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   WimaxNetwork* wimax = cros->FindWimaxNetworkByPath(service_path_);
   if (!wimax) {
     // Shill no longer knows about this wimax network (edge case).
diff --git a/chrome/browser/chromeos/profiles/profile_helper.cc b/chrome/browser/chromeos/profiles/profile_helper.cc
index 3d83458..9ec1de9 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.cc
+++ b/chrome/browser/chromeos/profiles/profile_helper.cc
@@ -8,7 +8,6 @@
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/sms_observer.h"
@@ -109,7 +108,7 @@ void ProfileHelper::ProfileStartup(Profile* profile, bool process_startup) {
   if (process_startup) {
     static chromeos::SmsObserver* sms_observer =
         new chromeos::SmsObserver();
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
+    chromeos::NetworkLibrary::Get()->
         AddNetworkManagerObserver(sms_observer);
 
     profile->SetupChromeOSEnterpriseExtensionObserver();
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
index ae01d51..14c02e6 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
@@ -15,7 +15,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -779,9 +778,9 @@ void DeviceSettingsProvider::ApplyMetricsSetting(bool use_file,
 }
 
 void DeviceSettingsProvider::ApplyRoamingSetting(bool new_value) {
-  if (!CrosLibrary::Get())
+  if (!NetworkLibrary::Get())
     return;  // May not be initialized in tests.
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   const NetworkDevice* cellular = cros->FindCellularDevice();
   if (cellular) {
     bool device_value = cellular->data_roaming_allowed();
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 503cd0f..8cca8f5 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/path_service.h"
 #include "base/test/scoped_path_override.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
@@ -58,7 +58,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {
     DeviceSettingsTestBase::TearDown();
   }
 
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
 
   ScopedTestingLocalState local_state_;
 
diff --git a/chrome/browser/chromeos/sms_observer.cc b/chrome/browser/chromeos/sms_observer.cc
index be668fb..6a29b04 100644
--- a/chrome/browser/chromeos/sms_observer.cc
+++ b/chrome/browser/chromeos/sms_observer.cc
@@ -9,7 +9,6 @@
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chromeos/network/cros_network_functions.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -18,11 +17,11 @@
 namespace chromeos {
 
 SmsObserver::SmsObserver() {
-  UpdateObservers(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
+  UpdateObservers(chromeos::NetworkLibrary::Get());
 }
 
 SmsObserver::~SmsObserver() {
-  NetworkLibrary* library = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* library = chromeos::NetworkLibrary::Get();
   library->RemoveNetworkManagerObserver(this);
   DisconnectAll();
 }
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index 2de9077..b57c923 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -12,7 +12,6 @@
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
@@ -381,7 +380,7 @@ bool NetworkIcon::SetOrClearVpnConnected(const Network* network) {
   if (network->type() == TYPE_VPN)
     return false;  // Never show the VPN badge for a VPN network.
   chromeos::NetworkLibrary* cros =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   bool vpn_connected = (network->connected() &&
                         cros->virtual_network() &&
                         cros->virtual_network()->connected());
@@ -394,7 +393,7 @@ bool NetworkIcon::SetOrClearVpnConnected(const Network* network) {
 
 void NetworkIcon::Update() {
   chromeos::NetworkLibrary* cros =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   // First look for a visible network.
   const Network* network = cros->FindNetworkByPath(service_path_);
   if (!network) {
@@ -494,7 +493,7 @@ void NetworkIcon::SetIcon(const Network* network) {
 void NetworkIcon::SetBadges(const Network* network) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   chromeos::NetworkLibrary* cros =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
 
   bool use_dark_icons = resource_color_theme_ == NetworkMenuIcon::COLOR_DARK;
   switch (network->type()) {
@@ -560,7 +559,7 @@ bool NetworkIcon::ShouldShowInTray() const {
     return true;
   if (!Network::IsConnectedState(state_))
     return true;
-  NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* crosnet = NetworkLibrary::Get();
   if (crosnet->virtual_network())
     return true;
   return false;
@@ -674,7 +673,7 @@ void NetworkMenuIcon::NetworkIconChanged() {
 // If disconnected: returns any connecting non-ethernet network.
 // Otherwise, only return a network if the conenction was user initiated.
 const Network* NetworkMenuIcon::GetConnectingNetwork() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   const Network* connecting_network = cros->connecting_network();
   if (connecting_network &&
       connecting_network->type() != TYPE_ETHERNET &&
@@ -752,7 +751,7 @@ void NetworkMenuIcon::SetConnectingIconAndText(
 
 // Sets up the icon and badges for GenerateBitmap().
 bool NetworkMenuIcon::SetIconAndText() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   DCHECK(cros);
 
   icon_->ClearIconAndBadges();
@@ -796,7 +795,7 @@ bool NetworkMenuIcon::SetIconAndText() {
 }
 
 bool NetworkMenuIcon::SetVpnIconAndText() {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   DCHECK(cros);
 
   icon_->ClearIconAndBadges();
@@ -816,7 +815,7 @@ bool NetworkMenuIcon::SetVpnIconAndText() {
 }
 
 bool NetworkMenuIcon::SetActiveNetworkIconAndText(const Network* network) {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   bool animating = false;
 
@@ -981,4 +980,4 @@ int NetworkMenuIcon::NumImages(ImageType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
-}  // chromeos
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
index a63bd117..ba8c9fe 100644
--- a/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
 
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "grit/ash_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -81,7 +81,7 @@ class NetworkMenuIconTest : public testing::Test {
 
   // testing::Test implementation.
   virtual void SetUp() OVERRIDE {
-    cros_ = CrosLibrary::Get()->GetNetworkLibrary();
+    cros_ = NetworkLibrary::Get();
     // Ethernet connected = WIRED icon, no badges.
     ethernet_connected_image_ = NetworkMenuIcon::GenerateImageFromComponents(
         *rb_.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_NETWORK_WIRED),
@@ -198,7 +198,7 @@ class NetworkMenuIconTest : public testing::Test {
   }
 
  protected:
-  ScopedStubCrosEnabler cros_stub_;
+  ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   NetworkLibrary* cros_;
   ResourceBundle& rb_;
   gfx::ImageSkia ethernet_connected_image_;
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 92a8e22..4d6b796 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -51,7 +51,6 @@
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
@@ -300,7 +299,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
     DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
-    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* crosnet = NetworkLibrary::Get();
     crosnet->AddNetworkManagerObserver(this);
     OnNetworkManagerChanged(crosnet);
 
@@ -370,7 +369,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
     DBusThreadManager::Get()->GetSystemClockClient()->RemoveObserver(this);
-    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* crosnet = NetworkLibrary::Get();
     if (crosnet)
       crosnet->RemoveNetworkManagerObserver(this);
     input_method::InputMethodManager::Get()->RemoveObserver(this);
@@ -830,7 +829,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
                                       std::string* topup_url,
                                       std::string* setup_url) OVERRIDE {
     bool result = false;
-    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* crosnet = NetworkLibrary::Get();
     const NetworkDevice* cellular = crosnet->FindCellularDevice();
     if (!cellular)
       return false;
@@ -1246,7 +1245,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
       size_t link_index) OVERRIDE {
     if (message_type == ash::NetworkObserver::ERROR_OUT_OF_CREDITS) {
       const CellularNetwork* cellular =
-          CrosLibrary::Get()->GetNetworkLibrary()->cellular_network();
+          NetworkLibrary::Get()->cellular_network();
       if (cellular)
         ConnectToNetwork(cellular->service_path());
       ash::Shell::GetInstance()->system_tray_notifier()->
@@ -1269,7 +1268,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
         deal_url_to_open = deal_topup_url;
       } else {
         const Network* cellular =
-            CrosLibrary::Get()->GetNetworkLibrary()->cellular_network();
+            NetworkLibrary::Get()->cellular_network();
         if (!cellular)
           return;
         ShowNetworkSettings(cellular->service_path());
@@ -1312,7 +1311,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
 
   void UpdateCellular() {
     const CellularNetworkVector& cellular_networks =
-        CrosLibrary::Get()->GetNetworkLibrary()->cellular_networks();
+        NetworkLibrary::Get()->cellular_networks();
     if (cellular_networks.empty())
       return;
     // We only care about the first cellular network (in practice there will
diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
index 35d9d5a..76c36e9 100644
--- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
@@ -27,7 +27,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -91,7 +91,7 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness {
 
  private:
 #if defined OS_CHROMEOS
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  chromeos::ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
@@ -452,4 +452,3 @@ TEST_F(ActivityDatabaseTest, InitFailure) {
 }
 
 }  // namespace extensions
-
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 18ad7af..e01e1bb 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -49,7 +49,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
@@ -218,7 +218,7 @@ void BrowserPolicyConnector::Init(
     network_configuration_updater_.reset(
         new NetworkConfigurationUpdaterImplCros(
             GetPolicyService(),
-            chromeos::CrosLibrary::Get()->GetNetworkLibrary(),
+            chromeos::NetworkLibrary::Get(),
             make_scoped_ptr(new chromeos::CertificateHandler)));
   }
 #endif
diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
index d207f42..ab318e1 100644
--- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc
@@ -13,7 +13,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
@@ -101,7 +100,7 @@ class ChooseMobileNetworkHandler
 
 ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
     : is_page_ready_(false), has_pending_results_(false) {
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   if (const NetworkDevice* cellular = cros->FindCellularDevice()) {
     device_path_ = cellular->device_path();
     cros->AddNetworkDeviceObserver(device_path_, this);
@@ -111,7 +110,7 @@ ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
 
 ChooseMobileNetworkHandler::~ChooseMobileNetworkHandler() {
   if (!device_path_.empty()) {
-    NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+    NetworkLibrary* cros = NetworkLibrary::Get();
     cros->RemoveNetworkDeviceObserver(device_path_, this);
   }
 }
@@ -174,7 +173,7 @@ void ChooseMobileNetworkHandler::HandleCancel(const ListValue* args) {
   }
 
   // Switch to automatic mode.
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   cros->RequestCellularRegister(std::string());
 }
 
@@ -187,7 +186,7 @@ void ChooseMobileNetworkHandler::HandleConnect(const ListValue* args) {
     return;
   }
 
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* cros = NetworkLibrary::Get();
   cros->RequestCellularRegister(network_id);
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 3e5a5d6..2322c11 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -19,7 +19,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 #include "chrome/browser/profiles/profile.h"
@@ -44,7 +43,6 @@
 #include "url/gurl.h"
 
 using chromeos::CellularNetwork;
-using chromeos::CrosLibrary;
 using chromeos::MobileActivator;
 using chromeos::NetworkLibrary;
 using content::BrowserThread;
@@ -228,8 +226,7 @@ void MobileSetupUIHTMLSource::StartDataRequest(
     const content::URLDataSource::GotDataCallback& callback) {
   CellularNetwork* network = NULL;
   if (!path.empty()) {
-    network = CrosLibrary::Get()->GetNetworkLibrary()->
-        FindCellularNetworkByPath(path);
+    network = NetworkLibrary::Get()-> FindCellularNetworkByPath(path);
   }
 
   if (!network || (!network->SupportsActivation() && !network->activated())) {
@@ -302,7 +299,7 @@ MobileSetupHandler::~MobileSetupHandler() {
     MobileActivator::GetInstance()->RemoveObserver(this);
     MobileActivator::GetInstance()->TerminateActivation();
   } else if (type_ == TYPE_PORTAL_LTE) {
-    CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+    NetworkLibrary::Get()->RemoveNetworkManagerObserver(this);
   }
 }
 
@@ -399,7 +396,7 @@ void MobileSetupHandler::HandleGetDeviceInfo(const ListValue* args) {
   if (path.empty())
     return;
 
-  NetworkLibrary* network_lib = CrosLibrary::Get()->GetNetworkLibrary();
+  NetworkLibrary* network_lib = NetworkLibrary::Get();
   CellularNetwork* network =
       network_lib->FindCellularNetworkByPath(path.substr(1));
   if (!network) {
@@ -477,7 +474,7 @@ void MobileSetupHandler::GetDeviceInfo(CellularNetwork* network,
                                        DictionaryValue* value) {
   DCHECK(network);
   chromeos::NetworkLibrary* cros =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   if (!cros)
     return;
   value->SetBoolean("activate_over_non_cellular_network",
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 9adb33f..6de1c00 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -78,7 +78,6 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -1587,7 +1586,7 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
   }
 
   chromeos::NetworkLibrary* network_library =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+      chromeos::NetworkLibrary::Get();
   network_library->LoadOncNetworks(network_configs, onc_source);
 
   // Now that we've added the networks, we need to rescan them so they'll be
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 0479292..29ccd6f 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
@@ -638,7 +637,7 @@ void PopulateVPNDetails(const NetworkState* vpn,
   dictionary->SetString(kTagUsername, username);
 
   // TODO(stevenjb): Move FindOncFornetwork()
-  const base::DictionaryValue* onc = CrosLibrary::Get()->GetNetworkLibrary()->
+  const base::DictionaryValue* onc = NetworkLibrary::Get()->
       FindOncForNetwork(vpn->guid());
   NetworkPropertyUIData hostname_ui_data;
   hostname_ui_data.ParseOncProperty(
@@ -1423,7 +1422,7 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback(
   }
 
   const NetworkPropertyUIData property_ui_data(network->onc_source());
-  const base::DictionaryValue* onc = CrosLibrary::Get()->GetNetworkLibrary()->
+  const base::DictionaryValue* onc = NetworkLibrary::Get()->
       FindOncForNetwork(network->guid());
 
   base::DictionaryValue dictionary;
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 1ef1590..943520a 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -180,8 +180,6 @@
         'browser/chromeos/contacts/google_contact_store.h',
         'browser/chromeos/cros/cert_library.cc',
         'browser/chromeos/cros/cert_library.h',
-        'browser/chromeos/cros/cros_library.cc',
-        'browser/chromeos/cros/cros_library.h',
         'browser/chromeos/cros/enum_mapper.h',
         'browser/chromeos/cros/native_network_constants.cc',
         'browser/chromeos/cros/native_network_constants.h',
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 53ecfc1..6786342 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -15,7 +15,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace base {
@@ -218,7 +218,7 @@ class InProcessBrowserTest : public content::BrowserTestBase {
   bool multi_desktop_test_;
 
 #if defined(OS_CHROMEOS)
-  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  chromeos::ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)