Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/login/login_utils_browsertest.cc

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 441e39c7e7a3da6307879ec1f074200ea2019bff..a4cb540a31d093d99855022d301edd6ebd260fbd 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -34,10 +34,10 @@
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_unit_test_suite.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
@@ -207,9 +207,6 @@ class LoginUtilsTest : public testing::Test,
     command_line->AppendSwitchASCII(
         policy::switches::kDeviceManagementUrl, kDMServer);
 
-    if (!command_line->HasSwitch(::switches::kMultiProfiles))
-      command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
-
     // DBusThreadManager should be initialized before io_thread_state_, as
     // DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,
     // which is part of io_thread_state_.
@@ -533,9 +530,10 @@ class LoginUtilsParamTest
   LoginUtilsParamTest() {}
 
   virtual void SetUp() OVERRIDE {
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
+// TODO(skuhne): Remove this test class  entirely (and the headers)
+//    CommandLine* command_line = CommandLine::ForCurrentProcess();
+//    if (GetParam())
+//      command_line->AppendSwitch(::switches::kMultiProfiles);

[Mr4D (OOO till 08-26), 2014/05/14 16:32:40]

Sorry didn't get around to do this before passing on. Please remove the lines
and maybe even this class?

[zel, 2014/05/14 17:48:39]

Done.

     LoginUtilsTest::SetUp();
   }