Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3308)

Unified Diff: chrome/browser/chromeos/login/login_utils_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
Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 9ec9973ac56f80ccc3a7fe1588cb5d2634f739fe..4649296db034156194081bdf0e45107368c3e650 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -35,7 +35,6 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/rlz/rlz.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -51,6 +50,7 @@
#include "chromeos/system/statistics_provider.h"
#include "components/policy/core/common/cloud/device_management_service.h"
#include "components/policy/core/common/policy_service.h"
+#include "components/policy/core/common/policy_switches.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_utils.h"
@@ -192,7 +192,7 @@ class LoginUtilsTest : public testing::Test,
CommandLine* command_line = CommandLine::ForCurrentProcess();
command_line->AppendSwitchASCII(
- ::switches::kDeviceManagementUrl, kDMServer);
+ policy::switches::kDeviceManagementUrl, kDMServer);
command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
// DBusThreadManager should be initialized before io_thread_state_, as

Powered by Google App Engine
This is Rietveld 408576698