Clean up ProfileManager interface.

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 38cc153f64b02b303c24e3c0c13b89602e550bb3..68939f814e4f7cf79260a0a2b494dfa4e1f7bc50 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -840,20 +840,19 @@ bool HasPendingUncleanExit(Profile* profile) {
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }
 
-base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
-                                     const base::CommandLine& command_line) {
+base::FilePath GetStartupProfilePath(const base::CommandLine& command_line) {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (command_line.HasSwitch(switches::kProfileDirectory)) {
-    return user_data_dir.Append(
+    return profile_manager->user_data_dir().Append(
         command_line.GetSwitchValuePath(switches::kProfileDirectory));
   }
 
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
-    return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
-        GetProfilePath(user_data_dir);
+    return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)
+        ->GetProfilePath();
   }
 
-  return g_browser_process->profile_manager()->GetLastUsedProfileDir(
-      user_data_dir);
+  return profile_manager->GetLastUsedProfileDir();
 }