Move cryptohome_library to src/chromeos

chrome/browser/chromeos/net/connectivity_state_helper.cc

 // Copyright (c) 2013 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/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"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 static ConnectivityStateHelper* g_connectivity_state_helper = NULL;
+static ConnectivityStateHelper* g_test_connectivity_state_helper = NULL;
 
 // Implementation of the connectivity state helper that uses the network
 // state handler for fetching connectivity state.
 class ConnectivityStateHelperImpl
     : public ConnectivityStateHelper,
       public NetworkStateHandlerObserver {
  public:
   ConnectivityStateHelperImpl();
   virtual ~ConnectivityStateHelperImpl();
 
@@ skipping 50 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableNewNetworkChangeNotifier)) {
     g_connectivity_state_helper = new ConnectivityStateHelperImpl();
   } else {
     g_connectivity_state_helper =
         new ConnectivityStateHelperNetworkLibrary();
   }
 }
 
 // static
-void ConnectivityStateHelper::InitializeForTesting(
-    ConnectivityStateHelper* connectivity_state_helper) {
-  CHECK(!g_connectivity_state_helper);
-  CHECK(connectivity_state_helper);
-  g_connectivity_state_helper = connectivity_state_helper;
-}
-
-// static
 bool ConnectivityStateHelper::IsInitialized() {
   return g_connectivity_state_helper != NULL;
 }
 
 // static
 void ConnectivityStateHelper::Shutdown() {
   CHECK(g_connectivity_state_helper);
   delete g_connectivity_state_helper;
   g_connectivity_state_helper = NULL;
 }
 
 // static
 ConnectivityStateHelper* ConnectivityStateHelper::Get() {
-  CHECK(g_connectivity_state_helper)
+  CHECK(g_connectivity_state_helper || g_test_connectivity_state_helper)
       << "ConnectivityStateHelper: Get() called before Initialize()";
+  if (g_test_connectivity_state_helper)
+    return g_test_connectivity_state_helper;
   return g_connectivity_state_helper;
 }
 
+// static
+void ConnectivityStateHelper::SetForTest(ConnectivityStateHelper* impl) {
+  CHECK(!g_test_connectivity_state_helper || !impl);
+  g_test_connectivity_state_helper = impl;
+}
+
 void ConnectivityStateHelper::AddNetworkManagerObserver(
     ConnectivityStateHelperObserver* observer) {
   network_manager_observers_.AddObserver(observer);
 }
 
 void ConnectivityStateHelper::RemoveNetworkManagerObserver(
     ConnectivityStateHelperObserver* observer) {
   network_manager_observers_.RemoveObserver(observer);
 }
 
@@ skipping 134 matching lines @@
   network_library_->RequestNetworkScan();
 }
 
 void ConnectivityStateHelperNetworkLibrary::OnNetworkManagerChanged(
     NetworkLibrary* network_library) {
   FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, network_manager_observers_,
                     NetworkManagerChanged());
 }
 
 }  // namespace chromeos