Multi-profile flag cleanup.

chrome/browser/profiles/profile_manager_unittest.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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
@@ skipping 360 matching lines @@
   virtual Profile* CreateProfileHelper(
       const base::FilePath& file_path) OVERRIDE {
     TestingProfile::Builder builder;
     builder.SetGuestSession();
     builder.SetPath(file_path);
     TestingProfile* testing_profile = builder.Build().release();
     return testing_profile;
   }
 };
 
-class ProfileManagerGuestTest : public ProfileManagerTest,
-                                public testing::WithParamInterface<bool>  {
+class ProfileManagerGuestTest : public ProfileManagerTest  {
  protected:
   virtual void SetUp() {
     // Create a new temporary directory, and store the path
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     TestingBrowserProcess::GetGlobal()->SetProfileManager(
         new UnittestGuestProfileManager(temp_dir_.path()));
 
 #if defined(OS_CHROMEOS)
     CommandLine* cl = CommandLine::ForCurrentProcess();
-    if (GetParam())
-      cl->AppendSwitch(switches::kMultiProfiles);
+    // This switch is needed to skip non-test specific behavior in
+    // ProfileManager (accessing DBusThreadManager).
+    cl->AppendSwitch(switches::kTestType);
 
-    cl->AppendSwitch(switches::kTestType);
-    if (profiles::IsMultipleProfilesEnabled()) {
-      cl->AppendSwitchASCII(chromeos::switches::kLoginProfile,
-                            std::string(chrome::kProfileDirPrefix) +
-                                chromeos::UserManager::kGuestUserName);
-    } else {
-      cl->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
-    }
+    cl->AppendSwitchASCII(chromeos::switches::kLoginProfile,
+                          std::string(chrome::kProfileDirPrefix) +
+                              chromeos::UserManager::kGuestUserName);
     cl->AppendSwitch(chromeos::switches::kGuestSession);
     cl->AppendSwitch(::switches::kIncognito);
 
     chromeos::UserManager::Get()->UserLoggedIn(
         chromeos::UserManager::kGuestUserName,
         chromeos::UserManager::kGuestUserName,
         false);
 #endif
   }
 };
 
-INSTANTIATE_TEST_CASE_P(ProfileManagerGuestTestInstantiation,
-                        ProfileManagerGuestTest,
-                        testing::Bool());
-
-TEST_P(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) {
+TEST_F(ProfileManagerGuestTest, GetLastUsedProfileAllowedByPolicy) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ASSERT_TRUE(profile_manager);
 
   Profile* profile = profile_manager->GetLastUsedProfileAllowedByPolicy();
   ASSERT_TRUE(profile);
   EXPECT_TRUE(profile->IsOffTheRecord());
 }
 
 #if defined(OS_CHROMEOS)
-TEST_P(ProfileManagerGuestTest, GuestProfileIngonito) {
+TEST_F(ProfileManagerGuestTest, GuestProfileIngonito) {
   Profile* primary_profile = ProfileManager::GetPrimaryUserProfile();
   EXPECT_TRUE(primary_profile->IsOffTheRecord());
 
   Profile* active_profile = ProfileManager::GetActiveUserProfile();
   EXPECT_TRUE(active_profile->IsOffTheRecord());
 
   EXPECT_TRUE(active_profile->IsSameProfile(primary_profile));
 
   Profile* last_used_profile = ProfileManager::GetLastUsedProfile();
   EXPECT_TRUE(last_used_profile->IsOffTheRecord());
@@ skipping 668 matching lines @@
                          dest_path2.BaseName().MaybeAsASCII());
   profile_manager->ScheduleProfileForDeletion(dest_path2,
                                               ProfileManager::CreateCallback());
   // Spin the message loop so that all the callbacks can finish running.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath());
   EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed));
 }
 #endif  // !defined(OS_MACOSX)