cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

chrome/browser/chromeos/policy/power_policy_browsertest.cc

 // Copyright (c) 2013 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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/api/power.h"
 #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"
 #include "chromeos/dbus/power_manager/policy.pb.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 108 matching lines @@
   DevicePolicyCrosBrowserTest::SetUpOnMainThread();
 
   // Initialize user policy.
   InstallUserKey();
   user_policy_.policy_data().set_username(chromeos::UserManager::kStubUser);
 }
 
 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));
   ASSERT_TRUE(file_util::CreateDirectory(user_key_file.DirName()));
   ASSERT_EQ(file_util::WriteFile(
                 user_key_file,
                 reinterpret_cast<const char*>(user_key_bits.data()),
                 user_key_bits.size()),
             static_cast<int>(user_key_bits.size()));
 }
@@ skipping 230 matching lines @@
   policy.set_ac_idle_action(
       power_manager_client_->get_policy().ac_idle_action());
   policy.set_battery_idle_action(
       power_manager_client_->get_policy().battery_idle_action());
   policy.set_reason(power_manager_client_->get_policy().reason());
   EXPECT_EQ(GetDebugString(policy),
             GetDebugString(power_manager_client_->get_policy()));
 }
 
 }  // namespace policy