cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

chrome/browser/chromeos/policy/power_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/power_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index fa9776cd3ac1f1e3c45b99748d7b1a4572a8ed92..b00064f82bff3f7b750af6d485175c175b71d843 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -43,6 +43,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
@@ -171,8 +172,11 @@ void PowerPolicyBrowserTestBase::SetUpOnMainThread() {
 void PowerPolicyBrowserTestBase::InstallUserKey() {
   base::FilePath user_keys_dir;
   ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_keys_dir));
+  std::string sanitized_username =
+      chromeos::CryptohomeClient::GetStubSanitizedUsername(
+          chromeos::UserManager::kStubUser);

[satorux1, 2013/09/27 02:31:02]

This change was needed as the new FakeCryptohomeClient now returns a sanitized
username, which is a more correct behavior.

   base::FilePath user_key_file =
-      user_keys_dir.AppendASCII(chromeos::UserManager::kStubUser)
+      user_keys_dir.AppendASCII(sanitized_username)
                    .AppendASCII("policy.pub");
   std::vector<uint8> user_key_bits;
   ASSERT_TRUE(user_policy_.GetSigningKey()->ExportPublicKey(&user_key_bits));