chrome/browser/chromeos/policy/device_local_account_browsertest.cc - Issue 131023004: Moved the --device-management-url switch to the policy component.

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_local_account_browsertest.cc

Issue 131023004: Moved the --device-management-url switch to the policy component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@BPC-1-split

Patch Set: rebase Created 6 years, 11 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/login/login_utils_browsertest.cc ('k') | chrome/browser/policy/chrome_browser_policy_connector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a30fbd9f70349d4d1c0c8f17db024e9106c4a56e..14cc32efa46a67cfe24cb2b3e56d939624a8e1d0 100644

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

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

@@ -71,7 +71,6 @@

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "chrome/common/chrome_paths.h"

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

#include "chromeos/chromeos_paths.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/dbus/fake_session_manager_client.h"

@@ -83,6 +82,7 @@

#include "components/policy/core/common/policy_map.h"

#include "components/policy/core/common/policy_namespace.h"

#include "components/policy/core/common/policy_service.h"

+#include "components/policy/core/common/policy_switches.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/web_contents.h"

@@ -308,8 +308,8 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,

command_line->AppendSwitch(chromeos::switches::kLoginManager);

command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);

command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");

- command_line->AppendSwitchASCII(

- switches::kDeviceManagementUrl, test_server_.GetServiceURL().spec());

+ command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,

+ test_server_.GetServiceURL().spec());

}

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {