cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

chrome/browser/policy/browser_policy_connector.cc

 // 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/policy/browser_policy_connector.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 170 matching lines @@
       weak_ptr_factory_(this) {
   // GetPolicyService() must be ready after the constructor is done.
   // The connector is created very early during startup, when the browser
   // threads aren't running yet; initialize components that need local_state,
   // the system request context or other threads (e.g. FILE) at Init().
 
   platform_provider_.reset(CreatePlatformProvider());
 
 #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));
     install_attributes_->ReadCacheFile(install_attrs_file);
 
     scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store(
         new DeviceCloudPolicyStoreChromeOS(
             chromeos::DeviceSettingsService::Get(),
             install_attributes_.get()));
     device_cloud_policy_manager_.reset(
@@ skipping 340 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy