cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.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/chromeos/policy/device_cloud_policy_store_chromeos.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 17 matching lines @@
   *out = result;
   loop->Quit();
 }
 
 }  // namespace
 
 class DeviceCloudPolicyStoreChromeOSTest
     : public chromeos::DeviceSettingsTestBase {
  protected:
   DeviceCloudPolicyStoreChromeOSTest()
-      : cryptohome_library_(chromeos::CryptohomeLibrary::GetTestImpl()),
-        fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
+      : fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
         install_attributes_(new EnterpriseInstallAttributes(
-            cryptohome_library_.get(), fake_cryptohome_client_.get())),
+            fake_cryptohome_client_.get())),
         store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
                                                   install_attributes_.get())) {
     fake_cryptohome_client_->Init(NULL /* no dbus::Bus */);
   }
 
   virtual void SetUp() OVERRIDE {
     DeviceSettingsTestBase::SetUp();
 
     base::RunLoop loop;
     EnterpriseInstallAttributes::LockResult result;
@@ skipping 37 matching lines @@
 
   void PrepareNewSigningKey() {
     device_policy_.SetDefaultNewSigningKey();
     device_policy_.Build();
     owner_key_util_->SetPublicKeyFromPrivateKey(
         *device_policy_.GetNewSigningKey());
   }
 
   void ResetToNonEnterprise() {
     store_.reset();
-    cryptohome_library_->InstallAttributesSet("enterprise.owned",
-                                              std::string());
+    chromeos::cryptohome_util::InstallAttributesSet("enterprise.owned",
+                                                    std::string());
     install_attributes_.reset(new EnterpriseInstallAttributes(
-        cryptohome_library_.get(), fake_cryptohome_client_.get()));
+        fake_cryptohome_client_.get()));
     store_.reset(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
                                                     install_attributes_.get()));
   }
 
-  scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_library_;
   scoped_ptr<chromeos::FakeCryptohomeClient> fake_cryptohome_client_;
   scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
 
   scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyStoreChromeOSTest);
 };
 
 TEST_F(DeviceCloudPolicyStoreChromeOSTest, LoadNoKey) {
@@ skipping 92 matching lines @@
 
 TEST_F(DeviceCloudPolicyStoreChromeOSTest, InstallInitialPolicyNotEnterprise) {
   PrepareNewSigningKey();
   ResetToNonEnterprise();
   store_->InstallInitialPolicy(device_policy_.policy());
   FlushDeviceSettings();
   ExpectFailure(CloudPolicyStore::STATUS_BAD_STATE);
 }
 
 }  // namespace policy