Clean up ProfileManager interface.

chrome/browser/ui/app_list/app_list_service_unittest.cc

 // Copyright 2013 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/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
@@ skipping 129 matching lines @@
 
 TEST_F(AppListServiceUnitTest, RemovedProfileResetsToInitialProfile) {
   EnableAppList();
   profile_store_->RemoveProfile(profile1_.get());
 
   // kAppListProfile should have been cleared, and therefore GetProfilePath
   // should return the initial profile.
   EXPECT_EQ("", local_state_->GetString(prefs::kAppListProfile));
   base::FilePath initial_profile_path =
       user_data_dir_.AppendASCII(chrome::kInitialProfile);
-  EXPECT_EQ(initial_profile_path,
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(initial_profile_path, service_->GetProfilePath());
 }
 
 TEST_F(AppListServiceUnitTest,
        RemovedProfileResetsToLastUsedProfileIfExists) {
   local_state_->SetString(prefs::kProfileLastUsed, "last-used");
   EnableAppList();
   profile_store_->RemoveProfile(profile1_.get());
 
   // kAppListProfile should have been set to kProfileLastUsed.
   EXPECT_EQ("last-used", local_state_->GetString(prefs::kAppListProfile));
   base::FilePath last_used_profile_path =
       user_data_dir_.AppendASCII("last-used");
-  EXPECT_EQ(last_used_profile_path,
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(last_used_profile_path, service_->GetProfilePath());
 
   // For this test, the AppListViewDelegate is not created because the
   // app list is never shown, so there is nothing to destroy.
   EXPECT_EQ(0, service_->destroy_app_list_call_count());
 }
 
 TEST_F(AppListServiceUnitTest, RefusesToLoadGuestAppListProfile) {
   // Unlikely, but if somehow the user's app_list.profile pref was set to the
   // guest profile, make sure we refuse to load it (or it would crash).
   local_state_->SetString(
       prefs::kAppListProfile,
       base::FilePath(chrome::kGuestProfileDir).MaybeAsASCII());
   local_state_->SetString(prefs::kProfileLastUsed, "last-used");
   base::FilePath last_used_profile_path =
       user_data_dir_.AppendASCII("last-used");
-  EXPECT_EQ(last_used_profile_path,
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(last_used_profile_path, service_->GetProfilePath());
 }
 
 TEST_F(AppListServiceUnitTest, RefusesToLoadGuestLastUsedProfile) {
   // If the user's most recent browser session was a guest session, make sure we
   // do not open a guest profile in the launcher (which would crash).
   local_state_->SetString(
       prefs::kProfileLastUsed,
       base::FilePath(chrome::kGuestProfileDir).MaybeAsASCII());
   base::FilePath initial_profile_path =
       user_data_dir_.AppendASCII(chrome::kInitialProfile);
-  EXPECT_EQ(initial_profile_path,
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(initial_profile_path, service_->GetProfilePath());
 }
 
 TEST_F(AppListServiceUnitTest, SwitchingProfilesPersists) {
   profile_store_->LoadProfile(profile1_.get());
   profile_store_->LoadProfile(profile2_.get());
   EnableAppList();
   service_->SetProfilePath(profile2_->GetPath());
   service_->Show();
   EXPECT_EQ(profile2_.get(), service_->showing_for_profile());
-  EXPECT_EQ(profile2_->GetPath(),
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(profile2_->GetPath(), service_->GetProfilePath());
   service_->SetProfilePath(profile1_->GetPath());
-  EXPECT_EQ(profile1_->GetPath(),
-            service_->GetProfilePath(profile_store_->GetUserDataDir()));
+  EXPECT_EQ(profile1_->GetPath(), service_->GetProfilePath());
 }
 
 TEST_F(AppListServiceUnitTest, EnableViaCommandLineFlag) {
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   command_line.AppendSwitch(switches::kEnableAppList);
   SetupWithCommandLine(command_line);
   service_->PerformStartupChecks(profile1_.get());
   EXPECT_TRUE(local_state_->GetBoolean(prefs::kAppLauncherHasBeenEnabled));
 }
 
@@ skipping 47 matching lines @@
   EXPECT_EQ(AppListService::ENABLE_FOR_APP_INSTALL,
             local_state_->GetInteger(prefs::kAppListEnableMethod));
   EXPECT_NE(0, local_state_->GetInt64(prefs::kAppListEnableTime));
 
   // An auto-show here should update the enable method to prevent recording it
   // as ENABLE_FOR_APP_INSTALL.
   service_->ShowForAppInstall(profile1_.get(), "", false);
   EXPECT_EQ(AppListService::ENABLE_SHOWN_UNDISCOVERED,
             local_state_->GetInteger(prefs::kAppListEnableMethod));
 }