chrome/browser/chromeos/login/existing_user_controller_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/chromeos/login/existing_user_controller_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: 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/extensions/default_app_order_unittest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

index 8d06a0d86d10d40aa3733759e2c86a716c8a63bd..2973118a5976932bfac0eb416a48248da2df053e 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -43,11 +43,11 @@

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

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

#include "chrome/common/chrome_notification_types.h"

-#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "chromeos/chromeos_paths.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/dbus/fake_session_manager_client.h"

#include "chromeos/dbus/mock_dbus_thread_manager.h"

@@ -494,7 +494,8 @@ class ExistingUserControllerPublicSessionTest

reinterpret_cast<const char*>(vector_as_array(&owner_key_bits)),

owner_key_bits.size()),

static_cast<int>(owner_key_bits.size()));

- ASSERT_TRUE(PathService::Override(chrome::FILE_OWNER_KEY, owner_key_file));

+ ASSERT_TRUE(

+ PathService::Override(chromeos::FILE_OWNER_KEY, owner_key_file));

// Setup the device policy.

em::ChromeDeviceSettingsProto& proto(device_policy_.payload());