diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 06:55:51 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 06:55:51 +0000 |
| commit | 0b5c093b1c139d66a8b69d9600397da49c85a76f (patch) | |
| tree | 1e8e6a0c53a079acb1f0729554060fa303dbdd3d /chrome/browser/chromeos/preferences_browsertest.cc | |
| parent | 5aed8ebdc4fbb64293d9b069506e7c4dbffd99dc (diff) | |
| download | chromium_src-0b5c093b1c139d66a8b69d9600397da49c85a76f.zip chromium_src-0b5c093b1c139d66a8b69d9600397da49c85a76f.tar.gz chromium_src-0b5c093b1c139d66a8b69d9600397da49c85a76f.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chromeos/preferences_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/preferences_browsertest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
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); } |