Turning on MultiProfile by default for ChromeOS

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"
@@ skipping 58 matching lines @@
 };
 
 } // namespace
 
 // This file contains tests for the ProfileManager that require a heavyweight
 // InProcessBrowserTest.  These include tests involving profile deletion.
 
 // TODO(jeremy): crbug.com/103355 - These tests should be enabled on all
 // platforms.
 class ProfileManagerBrowserTest : public InProcessBrowserTest {
+ protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+#if defined(OS_CHROMEOS)
+    command_line->AppendSwitch(
+        chromeos::switches::kIgnoreUserProfileMappingForTests);
+#endif
+  }
 };
 
 #if defined(OS_MACOSX)
 
 // Delete single profile and make sure a new one is created.
 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DeleteSingletonProfile) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   ProfileRemovalObserver observer;
 
@@ skipping 65 matching lines @@
   EXPECT_NE(new_profile_path, profile_path2);
 
   // Make sure that last used profile preference is set correctly.
   Profile* last_used = ProfileManager::GetLastUsedProfile();
   EXPECT_EQ(new_profile_path, last_used->GetPath());
 }
 #endif  // OS_MACOSX
 
 #if defined(OS_CHROMEOS)
 
-class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest,
-                                      public testing::WithParamInterface<bool> {
+class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    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");
-    }
+    // 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) {
+IN_PROC_BROWSER_TEST_F(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.AppendASCII(
-        std::string(chrome::kProfileDirPrefix) + "test-user-hash");
-  } else {
-    profile_path = profile_path.AppendASCII(chrome::kTestUserProfileDir);
-  }
+  profile_path = profile_path.AppendASCII(
+      std::string(chrome::kProfileDirPrefix) + "test-user-hash");
   EXPECT_EQ(profile_path.value(), last_used_profile->GetPath().value());
 }
 
-INSTANTIATE_TEST_CASE_P(ProfileManagerCrOSBrowserTestInstantiation,
-                        ProfileManagerCrOSBrowserTest,
-                        testing::Bool());
-
 #endif  // OS_CHROMEOS
 
 // Times out (http://crbug.com/159002)
 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
                        DISABLED_CreateProfileWithCallback) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
   ASSERT_EQ(profile_manager->GetNumberOfProfiles(), 1U);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
 
@@ skipping 140 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());
 }