cros: Don't prefix test user profile.

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 410bad7ac3e08a09f16df05a1f710219217e5011..ae4ec71667703a586f8a65569ba9351789270043 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -34,20 +34,16 @@ using ::testing::Return;
 
 namespace {
 
-class LoginUserTest : public InProcessBrowserTest,
-                      public testing::WithParamInterface<bool> {
+class LoginUserTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(
         chromeos::switches::kLoginUser, "TestUser@gmail.com");
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
   }
 };
 
-class LoginGuestTest : public InProcessBrowserTest,
-                       public testing::WithParamInterface<bool>  {
+class LoginGuestTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kGuestSession);
@@ -55,8 +51,6 @@ class LoginGuestTest : public InProcessBrowserTest,
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
     command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
                                     chromeos::UserManager::kGuestUserName);
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
   }
 };
 
@@ -143,22 +137,19 @@ class LoginSigninTest : public InProcessBrowserTest {
 // After a chrome crash, the session manager will restart chrome with
 // the -login-user flag indicating that the user is already logged in.
 // This profile should NOT be an OTR profile.
-IN_PROC_BROWSER_TEST_P(LoginUserTest, UserPassed) {
+IN_PROC_BROWSER_TEST_F(LoginUserTest, UserPassed) {
   Profile* profile = browser()->profile();
-  std::string profile_base_path("user");
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))
-    profile_base_path.insert(0, chrome::kProfileDirPrefix);
-  EXPECT_EQ(profile_base_path, profile->GetPath().BaseName().value());
+  EXPECT_EQ("user", profile->GetPath().BaseName().value());
   EXPECT_FALSE(profile->IsOffTheRecord());
 }
 
 // Verifies the cursor is not hidden at startup when user is logged in.
-IN_PROC_BROWSER_TEST_P(LoginUserTest, CursorShown) {
+IN_PROC_BROWSER_TEST_F(LoginUserTest, CursorShown) {
   EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
 }
 
 // After a guest login, we should get the OTR default profile.
-IN_PROC_BROWSER_TEST_P(LoginGuestTest, GuestIsOTR) {
+IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) {
   Profile* profile = browser()->profile();
   EXPECT_TRUE(profile->IsOffTheRecord());
   // Ensure there's extension service for this profile.
@@ -166,7 +157,7 @@ IN_PROC_BROWSER_TEST_P(LoginGuestTest, GuestIsOTR) {
 }
 
 // Verifies the cursor is not hidden at startup when running guest session.
-IN_PROC_BROWSER_TEST_P(LoginGuestTest, CursorShown) {
+IN_PROC_BROWSER_TEST_F(LoginGuestTest, CursorShown) {
   EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
 }
 
@@ -195,12 +186,4 @@ IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
   runner->Run();
 }
 
-INSTANTIATE_TEST_CASE_P(LoginUserTestInstantiation,
-                        LoginUserTest,
-                        testing::Bool());
-
-INSTANTIATE_TEST_CASE_P(LoginGuestTestInstantiation,
-                        LoginGuestTest,
-                        testing::Bool());
-
 }  // namespace