Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/login/login_browsertest.cc

Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 9b996324b28c83060bbd8b415fb6a776660e155e..68cf98a80da41d42e5f63191fe66343023b9e2f8 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -34,7 +35,8 @@ class LoginUserTest : public InProcessBrowserTest {
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(
         chromeos::switches::kLoginUser, "TestUser@gmail.com");
-    command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
+    command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
+                                    "hash");
   }
 };
 
@@ -43,7 +45,8 @@ class LoginGuestTest : public InProcessBrowserTest {
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kGuestSession);
     command_line->AppendSwitch(::switches::kIncognito);
-    command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
+    command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
+                                    "hash");
     command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
                                     chromeos::UserManager::kGuestUserName);
   }
@@ -64,7 +67,8 @@ class LoginSigninTest : public InProcessBrowserTest {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    ASSERT_TRUE(tracing::BeginTracingWithWatch("ui", "ui", "ShowLoginWebUI", 1));
+    ASSERT_TRUE(tracing::BeginTracingWithWatch(
+        "ui", "ui", "ShowLoginWebUI", 1));
   }
 };
 
@@ -73,7 +77,9 @@ class LoginSigninTest : public InProcessBrowserTest {
 // This profile should NOT be an OTR profile.
 IN_PROC_BROWSER_TEST_F(LoginUserTest, UserPassed) {
   Profile* profile = browser()->profile();
-  EXPECT_EQ("user", profile->GetPath().BaseName().value());
+  std::string profile_base_path("hash");
+  profile_base_path.insert(0, chrome::kProfileDirPrefix);
+  EXPECT_EQ(profile_base_path, profile->GetPath().BaseName().value());
   EXPECT_FALSE(profile->IsOffTheRecord());
 }