cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

chrome/browser/chromeos/policy/enterprise_install_attributes_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/enterprise_install_attributes.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/policy/proto/chromeos/install_attributes.pb.h"
 #include "chromeos/cryptohome/cryptohome_library.h"
-#include "chromeos/dbus/cryptohome_client_stub.h"
+#include "chromeos/dbus/fake_cryptohome_client.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 namespace {
 
 void CopyLockResult(base::RunLoop* loop,
                     EnterpriseInstallAttributes::LockResult* out,
                     EnterpriseInstallAttributes::LockResult result) {
   *out = result;
   loop->Quit();
 }
 
 }  // namespace
 
 static const char kTestUser[] = "test@example.com";
 static const char kTestUserCanonicalize[] = "UPPER.CASE@example.com";
 static const char kTestDomain[] = "example.com";
 static const char kTestDeviceId[] = "133750519";
 
 class EnterpriseInstallAttributesTest : public testing::Test {
  protected:
   EnterpriseInstallAttributesTest()
       : cryptohome_(chromeos::CryptohomeLibrary::GetTestImpl()),
-        stub_cryptohome_client_(new chromeos::CryptohomeClientStubImpl()),
-        install_attributes_(cryptohome_.get(), stub_cryptohome_client_.get()) {
-    stub_cryptohome_client_->Init(NULL /* no dbus::Bus */);
+        fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),
+        install_attributes_(cryptohome_.get(), fake_cryptohome_client_.get()) {
+    fake_cryptohome_client_->Init(NULL /* no dbus::Bus */);
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   base::FilePath GetTempPath() const {
     return temp_dir_.path().Append("install_attrs_test");
   }
 
   void SetAttribute(
       cryptohome::SerializedInstallAttributes* install_attrs_proto,
       const std::string& name,
       const std::string& value) {
     cryptohome::SerializedInstallAttributes::Attribute* attribute;
     attribute = install_attrs_proto->add_attributes();
     attribute->set_name(name);
     attribute->set_value(value);
   }
 
   base::MessageLoopForUI message_loop_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_;
-  scoped_ptr<chromeos::CryptohomeClientStubImpl> stub_cryptohome_client_;
+  scoped_ptr<chromeos::FakeCryptohomeClient> fake_cryptohome_client_;
   EnterpriseInstallAttributes install_attributes_;
 
   EnterpriseInstallAttributes::LockResult LockDeviceAndWaitForResult(
       const std::string& user,
       DeviceMode device_mode,
       const std::string& device_id) {
     base::RunLoop loop;
     EnterpriseInstallAttributes::LockResult result;
     install_attributes_.LockDevice(user, device_mode, device_id,
                                    base::Bind(&CopyLockResult, &loop, &result));
@@ skipping 166 matching lines @@
   ASSERT_EQ(static_cast<int>(blob.size()),
             file_util::WriteFile(GetTempPath(), blob.c_str(), blob.size()));
   install_attributes_.ReadCacheFile(GetTempPath());
   EXPECT_EQ(DEVICE_MODE_CONSUMER_KIOSK, install_attributes_.GetMode());
   EXPECT_EQ("", install_attributes_.GetDomain());
   EXPECT_EQ("", install_attributes_.GetRegistrationUser());
   EXPECT_EQ("", install_attributes_.GetDeviceId());
 }
 
 }  // namespace policy