cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

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 76bdac29a9a8196522ffe49f4dc4cab4049bd69e..24a21c0594e049b0d75206a3c7f92a5efaffecbd 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -188,14 +188,15 @@ BrowserPolicyConnector::BrowserPolicyConnector()
 
 #if defined(OS_CHROMEOS)
   // CryptohomeLibrary or DBusThreadManager may be uninitialized on unit tests.
+
+  // TODO(satorux): Remove CryptohomeLibrary::IsInitialized() when it's ready
+  // (removing it now breaks tests). crbug.com/141016.
   if (chromeos::CryptohomeLibrary::IsInitialized() &&
       chromeos::DBusThreadManager::IsInitialized()) {
-    chromeos::CryptohomeLibrary* cryptohome =
-        chromeos::CryptohomeLibrary::Get();
     chromeos::CryptohomeClient* cryptohome_client =
         chromeos::DBusThreadManager::Get()->GetCryptohomeClient();
     install_attributes_.reset(
-        new EnterpriseInstallAttributes(cryptohome, cryptohome_client));
+        new EnterpriseInstallAttributes(cryptohome_client));
     base::FilePath install_attrs_file;
     CHECK(PathService::Get(chromeos::FILE_INSTALL_ATTRIBUTES,
                            &install_attrs_file));