cros: Don't prefix test user profile.

chrome/browser/profiles/profile_manager_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/path_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chromeos/chromeos_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #endif
 
 namespace {
 
 const profiles::ProfileSwitchingDoneCallback kOnProfileSwitchDoNothing;
 
 // An observer that returns back to test code after a new profile is
 // initialized.
 void OnUnblockOnProfileCreation(Profile* profile,
@@ skipping 136 matching lines @@
   EXPECT_EQ(new_profile_path, last_used->GetPath());
 }
 #endif  // OS_MACOSX
 
 #if defined(OS_CHROMEOS)
 
 class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest,
                                       public testing::WithParamInterface<bool> {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    if (GetParam())
+    if (GetParam()) {
       command_line->AppendSwitch(::switches::kMultiProfiles);
+      // Use a user hash other than the default chrome::kTestUserProfileDir
+      // so that the prefix case is tested.
+      command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
+                                      "test-user-hash");
+    }
   }
 };
 
 IN_PROC_BROWSER_TEST_P(ProfileManagerCrOSBrowserTest, GetLastUsedProfile) {
   // Make sure that last used profile is correct.
   Profile* last_used_profile = ProfileManager::GetLastUsedProfile();
   EXPECT_TRUE(last_used_profile != NULL);
 
   base::FilePath profile_path;
   PathService::Get(chrome::DIR_USER_DATA, &profile_path);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kMultiProfiles)) {
-    profile_path = profile_path.Append(base::FilePath(
-        std::string(chrome::kProfileDirPrefix) + chrome::kTestUserProfileDir));
+    profile_path = profile_path.AppendASCII(
+        std::string(chrome::kProfileDirPrefix) + "test-user-hash");
   } else {
-    profile_path = profile_path.Append(
-        base::FilePath(chrome::kTestUserProfileDir));
+    profile_path = profile_path.AppendASCII(chrome::kTestUserProfileDir);
   }
   EXPECT_EQ(profile_path.value(), last_used_profile->GetPath().value());
 }
 
 INSTANTIATE_TEST_CASE_P(ProfileManagerCrOSBrowserTestInstantiation,
                         ProfileManagerCrOSBrowserTest,
                         testing::Bool());
 
 #endif  // OS_CHROMEOS
 
@@ skipping 148 matching lines @@
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(2U, browser_list->size());
   ASSERT_EQ(2U, cache.GetNumberOfProfiles());
 
   // The second should though.
   browser_list->get(1)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1U, browser_list->size());
   ASSERT_EQ(1U, cache.GetNumberOfProfiles());
 }