cros: Don't prefix test user profile.

chrome/browser/chromeos/login/login_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 16 matching lines @@
 #include "extensions/browser/extension_system.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 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);
     command_line->AppendSwitch(::switches::kIncognito);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
     command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
                                     chromeos::UserManager::kGuestUserName);
-    if (GetParam())
-      command_line->AppendSwitch(::switches::kMultiProfiles);
   }
 };
 
 class LoginCursorTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
   }
 };
 
@@ skipping 66 matching lines @@
     content::SetBrowserClientForTesting(original_content_browser_client_);
   }
 
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
   content::ContentBrowserClient* original_content_browser_client_;
 };
 
 // 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.
   EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service());
 }
 
 // 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());
 }
 
 // Verifies the cursor is hidden at startup on login screen.
 IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) {
   // Login screen needs to be shown explicitly when running test.
   chromeos::ShowLoginWizard(chromeos::WizardController::kLoginScreenName);
 
   // Cursor should be hidden at startup
   EXPECT_FALSE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
 
   // Cursor should be shown after cursor is moved.
   EXPECT_TRUE(ui_test_utils::SendMouseMoveSync(gfx::Point()));
   EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
 
   base::MessageLoop::current()->DeleteSoon(
       FROM_HERE, chromeos::LoginDisplayHostImpl::default_host());
 }
 
 // Verifies that the webui for login comes up successfully.
 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   content_browser_client_->browser_main_extra_parts_->set_quit_task(
       runner->QuitClosure());
   runner->Run();
 }
 
-INSTANTIATE_TEST_CASE_P(LoginUserTestInstantiation,
-                        LoginUserTest,
-                        testing::Bool());
-
-INSTANTIATE_TEST_CASE_P(LoginGuestTestInstantiation,
-                        LoginGuestTest,
-                        testing::Bool());
-
 }  // namespace