Move cryptohome_library to src/chromeos

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index cafe4c5ad3ec164828d0424352064cb4b82cc1ec..d587a231dc6928fe1c566df4820aeb2c416bd79e 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -67,6 +67,7 @@
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #else
@@ -125,12 +126,11 @@ BrowserPolicyConnector::BrowserPolicyConnector()
       new DeviceManagementService(GetDeviceManagementUrl()));
 
 #if defined(OS_CHROMEOS)
-  chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get();
-  // |cros_library| may be NULL on unit tests. DBusThreadManager may not be
-  // initialized on unit tests..
-  if (cros_library && chromeos::DBusThreadManager::IsInitialized()) {
+  // CryptohomeLibrary or DBusThreadManager may be uninitialized on unit tests.
+  if (chromeos::CryptohomeLibrary::IsInitialized() &&
+      chromeos::DBusThreadManager::IsInitialized()) {
     chromeos::CryptohomeLibrary* cryptohome =
-        cros_library->GetCryptohomeLibrary();
+        chromeos::CryptohomeLibrary::Get();
     chromeos::CryptohomeClient* cryptohome_client =
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
     install_attributes_.reset(