Clean up ProfileManager interface.

chrome/browser/profiles/profiles_state.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 "chrome/browser/profiles/profiles_state.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 184 matching lines @@
 }
 
 SigninErrorController* GetSigninErrorController(Profile* profile) {
   return SigninErrorControllerFactory::GetForProfile(profile);
 }
 
 bool SetActiveProfileToGuestIfLocked() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
   const base::FilePath& active_profile_path =
-      profile_manager->GetLastUsedProfileDir(profile_manager->user_data_dir());
+      profile_manager->GetLastUsedProfileDir();
   const base::FilePath& guest_path = ProfileManager::GetGuestProfilePath();
   if (active_profile_path == guest_path)
     return true;
 
   const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(active_profile_path);
   if (!cache.ProfileIsSigninRequiredAtIndex(index))
     return false;
 
   PrefService* local_state = g_browser_process->local_state();
@@ skipping 18 matching lines @@
   // For guest the browsing data is in the OTR profile.
   if (profile->IsGuestSession())
     profile = profile->GetOffTheRecordProfile();
 
   BrowsingDataRemover::CreateForUnboundedRange(profile)->Remove(
       BrowsingDataRemover::REMOVE_ALL, BrowsingDataHelper::ALL);
   // BrowsingDataRemover deletes itself.
 }
 
 }  // namespace profiles