chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc - Issue 14179007: Move cryptohome_library to src/chromeos

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/device_cloud_policy_store_chromeos_unittest.cc

Issue 14179007: Move cryptohome_library to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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') | chromeos/cryptohome/cryptohome_library.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 163ea1a12b5211e40c9d19d3b3a76ae155cac2cb..2ed9daaba9e6301a9612c081a53216b8cf5ffb83 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

@@ -10,10 +10,10 @@

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

-#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"

#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

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

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

+#include "chromeos/cryptohome/mock_cryptohome_library.h"

#include "chromeos/dbus/mock_cryptohome_client.h"

#include "policy/policy_constants.h"

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

@@ -35,7 +35,7 @@ class DeviceCloudPolicyStoreChromeOSTest

: public chromeos::DeviceSettingsTestBase {

protected:

DeviceCloudPolicyStoreChromeOSTest()

- : cryptohome_library_(chromeos::CryptohomeLibrary::GetImpl(true)),

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

stub_cryptohome_client_(chromeos::CryptohomeClient::Create(

chromeos::STUB_DBUS_CLIENT_IMPLEMENTATION, NULL)),

install_attributes_(new EnterpriseInstallAttributes(