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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

Patch Set: fix the build 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_local_account_browsertest.cc ('k') | chrome/browser/chromeos/policy/power_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 32f2f08a6821f9c374d6a0e7855731fed44ece3b..c85940bd2e8c066905f6a96023ebdb257d148dca 100644

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

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

@@ -11,7 +11,7 @@

#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"

@@ -37,9 +37,9 @@ 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 {

@@ -63,7 +63,7 @@ class EnterpriseInstallAttributesTest : public testing::Test {

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(