From 0b5c093b1c139d66a8b69d9600397da49c85a76f Mon Sep 17 00:00:00 2001 From: "xiyuan@chromium.org" Date: Sat, 15 Feb 2014 06:55:51 +0000 Subject: Fix cros compile. r251522 and r251550 are conflicting. Both in fly and crashes. BUG=325564,223480 TBR=dzhioev@chromium.org Review URL: https://codereview.chromium.org/165563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251552 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/preferences_browsertest.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'chrome/browser/chromeos/preferences_browsertest.cc') diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_browsertest.cc index ed6c7c07..e955511 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_browsertest.cc @@ -44,7 +44,6 @@ class PreferencesTest : public LoginManagerTest { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { LoginManagerTest::SetUpCommandLine(command_line); command_line->AppendSwitch(::switches::kMultiProfiles); - command_line->AppendSwitch(switches::kForceMultiProfileInTests); command_line->AppendSwitch(switches::kStubCrosSettings); } -- cgit v1.1