chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc - Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | chrome/browser/extensions/api/networking_private/networking_private_apitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

index c87c340b9bf30757abb081dfe80b9d8ce03c38e3..c5f046095bf6409b34c2bf26018001611b73d09d 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

@@ -14,7 +14,7 @@

#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"

#include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"

#include "chromeos/cryptohome/cryptohome_library.h"

-#include "chromeos/dbus/cryptohome_client_stub.h"

+#include "chromeos/dbus/fake_cryptohome_client.h"

#include "policy/policy_constants.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -36,12 +36,12 @@ class DeviceCloudPolicyStoreChromeOSTest

protected:

DeviceCloudPolicyStoreChromeOSTest()

: cryptohome_library_(chromeos::CryptohomeLibrary::GetTestImpl()),

- stub_cryptohome_client_(new chromeos::CryptohomeClientStubImpl()),

+ fake_cryptohome_client_(new chromeos::FakeCryptohomeClient()),

install_attributes_(new EnterpriseInstallAttributes(

- cryptohome_library_.get(), stub_cryptohome_client_.get())),

+ cryptohome_library_.get(), fake_cryptohome_client_.get())),

store_(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,

install_attributes_.get())) {

- stub_cryptohome_client_->Init(NULL /* no dbus::Bus */);

+ fake_cryptohome_client_->Init(NULL /* no dbus::Bus */);

}

virtual void SetUp() OVERRIDE {

@@ -99,13 +99,13 @@ class DeviceCloudPolicyStoreChromeOSTest

cryptohome_library_->InstallAttributesSet("enterprise.owned",

std::string());

install_attributes_.reset(new EnterpriseInstallAttributes(

- cryptohome_library_.get(), stub_cryptohome_client_.get()));

+ cryptohome_library_.get(), fake_cryptohome_client_.get()));

store_.reset(new DeviceCloudPolicyStoreChromeOS(&device_settings_service_,

install_attributes_.get()));

}

scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_library_;

- scoped_ptr<chromeos::CryptohomeClientStubImpl> stub_cryptohome_client_;

+ scoped_ptr<chromeos::FakeCryptohomeClient> fake_cryptohome_client_;

scoped_ptr<EnterpriseInstallAttributes> install_attributes_;

scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_;