Clean up ProfileManager interface.

chrome/browser/profiles/profile_manager_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 227 matching lines @@
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // Use a user hash other than the default chrome::kTestUserProfileDir
     // so that the prefix case is tested.
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
                                     "test-user-hash");
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ProfileManagerCrOSBrowserTest, GetLastUsedProfile) {
   // Make sure that last used profile is correct.
-  Profile* last_used_profile = ProfileManager::GetLastUsedProfile();
+  Profile* last_used_profile =
+      g_browser_process->profile_manager()->GetLastUsedProfile();
   EXPECT_TRUE(last_used_profile != NULL);
 
   base::FilePath profile_path;
   PathService::Get(chrome::DIR_USER_DATA, &profile_path);
 
   profile_path = profile_path.AppendASCII(
       std::string(chrome::kProfileDirPrefix) + "test-user-hash");
   EXPECT_EQ(profile_path.value(), last_used_profile->GetPath().value());
 }
 
@@ skipping 198 matching lines @@
   profile_manager->ScheduleProfileForDeletion(
       profile->GetPath(), base::Bind(&OnUnblockOnProfileCreation, &run_loop));
   run_loop.Run();
 
   PasswordStoreConsumerVerifier verify_delete;
   password_store->GetAutofillableLogins(&verify_delete);
   verify_delete.Wait();
   EXPECT_EQ(0u, verify_delete.GetPasswords().size());
 }
 #endif  // !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)