Clean up ProfileManager interface.

chrome/browser/ui/startup/startup_browser_creator.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 "chrome/browser/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 822 matching lines @@
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !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();
 }