cryptohome: Move stateless wrapper functions out of CryptohomeLibrary

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index c509c4ec84586a40fc484d37a0192ce94e143c87..22abfff47a47f6c51cb2740b4b89dbbb3e88c0f9 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
@@ -58,10 +57,8 @@ class DeviceCloudPolicyManagerChromeOSTest
     : public chromeos::DeviceSettingsTestBase {
  protected:
   DeviceCloudPolicyManagerChromeOSTest()
-      : cryptohome_library_(chromeos::CryptohomeLibrary::GetTestImpl()),
-        fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
-        install_attributes_(cryptohome_library_.get(),
-                            fake_cryptohome_client_.get()),
+      : fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
+        install_attributes_(fake_cryptohome_client_.get()),
         store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,
                                                   &install_attributes_)),
         manager_(make_scoped_ptr(store_),
@@ -84,7 +81,6 @@ class DeviceCloudPolicyManagerChromeOSTest
         request_context_getter_.get());
     TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
     chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
-    chromeos::CryptohomeLibrary::SetForTest(cryptohome_library_.get());

[satorux1, 2013/10/01 05:24:03]

This turned out to be necessary, as CryptohomeLibrary is used in
chromeos::DeviceOAuth2TokenService::SetAndSaveRefreshToken(). For now, added a
TODO comment.

     url_fetcher_response_code_ = 200;
     url_fetcher_response_string_ = "{\"access_token\":\"accessToken4Test\","
                                    "\"expires_in\":1234,"
@@ -96,11 +92,9 @@ class DeviceCloudPolicyManagerChromeOSTest
     DeviceSettingsTestBase::TearDown();
 
     chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
-    chromeos::CryptohomeLibrary::SetForTest(NULL);
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
   }
 
-  scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_library_;
   scoped_ptr<chromeos::FakeCryptohomeClient> fake_cryptohome_client_;
   EnterpriseInstallAttributes install_attributes_;