chrome/browser/chromeos/policy/device_cloud_policy_manager_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_manager_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/net/connectivity_state_helper.cc ('k') | chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.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_manager_chromeos_unittest.cc

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

index 95e182f46c2a43030a4e4e2a69a2263f1c9638f8..567c67d85354ac04afc9bf4b07b255dd4bfbded5 100644

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

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

@@ -10,7 +10,6 @@

#include "base/prefs/pref_registry_simple.h"

#include "base/prefs/testing_pref_service.h"

#include "base/run_loop.h"

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

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

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

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

@@ -21,6 +20,7 @@

#include "chrome/browser/policy/cloud/mock_device_management_service.h"

#include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"

#include "chrome/browser/prefs/browser_prefs.h"

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

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_client_implementation_type.h"

#include "policy/policy_constants.h"

@@ -50,7 +50,7 @@ class DeviceCloudPolicyManagerChromeOSTest

: public chromeos::DeviceSettingsTestBase {

protected:

DeviceCloudPolicyManagerChromeOSTest()

- : 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_(cryptohome_library_.get(),