| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index b37e9351d962d679ba20457abb79bb89347d3311..5a70bd9063c568ae1d5acc768afa96f2ac9679fc 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -77,6 +77,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_info_cache.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/profiles/profile_manager_util.h"
|
| #include "chrome/browser/search_engines/template_url.h"
|
| #include "chrome/browser/search_engines/template_url_service.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| @@ -1057,8 +1058,7 @@ void TestingAutomationProvider::GetMultiProfileInfo(
|
| ProfileManager* profile_manager = g_browser_process->profile_manager();
|
| const ProfileInfoCache& profile_info_cache =
|
| profile_manager->GetProfileInfoCache();
|
| - return_value->SetBoolean("enabled",
|
| - profile_manager->IsMultipleProfilesEnabled());
|
| + return_value->SetBoolean("enabled", profiles::IsMultipleProfilesEnabled());
|
|
|
| ListValue* profiles = new ListValue;
|
| for (size_t index = 0; index < profile_info_cache.GetNumberOfProfiles();
|
| @@ -1152,7 +1152,7 @@ void TestingAutomationProvider::OpenProfileWindow(
|
| }
|
| new BrowserOpenedWithExistingProfileNotificationObserver(
|
| this, reply_message, num_loads);
|
| - ProfileManager::FindOrCreateNewWindowForProfile(
|
| + profiles::FindOrCreateNewWindowForProfile(
|
| profile,
|
| chrome::startup::IS_NOT_PROCESS_STARTUP,
|
| chrome::startup::IS_NOT_FIRST_RUN,
|
|
|