chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc - Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc.

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/policy/cloud/component_cloud_policy_browsertest.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (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:

Index: chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

index 416db9ad8a51cf3345f5a73e12d5b587ebba7563..9866f26a26bc7001ef42141ef54547b6e1c59896 100644

--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

@@ -35,6 +35,7 @@

#include "chrome/browser/chromeos/login/user_manager.h"

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

#include "chrome/common/chrome_paths.h"

+#include "chromeos/chromeos_paths.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/dbus/mock_cryptohome_client.h"

#include "chromeos/dbus/mock_dbus_thread_manager.h"

@@ -160,7 +161,8 @@ class ComponentCloudPolicyTest : public ExtensionBrowserTest {

base::FilePath user_key_path =

temp_dir_.path().AppendASCII(kSanitizedUsername)

.AppendASCII("policy.pub");

- PathService::Override(chrome::DIR_USER_POLICY_KEYS, temp_dir_.path());

+ ASSERT_TRUE(PathService::Override(chromeos::DIR_USER_POLICY_KEYS,

+ temp_dir_.path()));

mock_dbus_thread_manager_ = new chromeos::MockDBusThreadManager();

chromeos::DBusThreadManager::InitializeForTesting(