| Index: chrome/browser/profiles/profile_dependency_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
|
| index 6df75f222ed148d4a1140608395111215db9fa29..626acdb71deb86824ab5aa2d6862cf9e11b313bd 100644
|
| --- a/chrome/browser/profiles/profile_dependency_manager.cc
|
| +++ b/chrome/browser/profiles/profile_dependency_manager.cc
|
| @@ -15,17 +15,17 @@
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
|
| #include "chrome/browser/download/download_service_factory.h"
|
| #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_factory.h"
|
| -#include "chrome/browser/extensions/api/bookmarks/bookmark_api_factory.h"
|
| -#include "chrome/browser/extensions/api/commands/command_service_factory.h"
|
| +#include "chrome/browser/extensions/api/bookmarks/bookmark_api.h"
|
| +#include "chrome/browser/extensions/api/commands/command_service.h"
|
| #include "chrome/browser/extensions/api/cookies/cookies_api.h"
|
| #include "chrome/browser/extensions/api/dial/dial_api_factory.h"
|
| #include "chrome/browser/extensions/api/discovery/suggested_links_registry_factory.h"
|
| -#include "chrome/browser/extensions/api/font_settings/font_settings_api_factory.h"
|
| -#include "chrome/browser/extensions/api/history/history_api_factory.h"
|
| +#include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
|
| +#include "chrome/browser/extensions/api/history/history_api.h"
|
| #include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
|
| #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h"
|
| #include "chrome/browser/extensions/api/management/management_api.h"
|
| -#include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api_factory.h"
|
| +#include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
|
| #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
|
| #include "chrome/browser/extensions/api/preference/preference_api.h"
|
| #include "chrome/browser/extensions/api/processes/processes_api.h"
|
| @@ -246,14 +246,14 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
|
| DownloadServiceFactory::GetInstance();
|
| #if defined(ENABLE_EXTENSIONS)
|
| extensions::AppRestoreServiceFactory::GetInstance();
|
| - extensions::BookmarkAPIFactory::GetInstance();
|
| + extensions::BookmarkAPI::GetFactoryInstance();
|
| extensions::BluetoothAPIFactory::GetInstance();
|
| - extensions::CommandServiceFactory::GetInstance();
|
| + extensions::CommandService::GetFactoryInstance();
|
| extensions::CookiesAPI::GetFactoryInstance();
|
| extensions::DialAPIFactory::GetInstance();
|
| extensions::ExtensionSystemFactory::GetInstance();
|
| - extensions::FontSettingsAPIFactory::GetInstance();
|
| - extensions::HistoryAPIFactory::GetInstance();
|
| + extensions::FontSettingsAPI::GetFactoryInstance();
|
| + extensions::HistoryAPI::GetFactoryInstance();
|
| extensions::IdleManagerFactory::GetInstance();
|
| #if defined(OS_CHROMEOS)
|
| extensions::InputImeAPI::GetFactoryInstance();
|
| @@ -261,7 +261,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
|
| #endif
|
| extensions::ManagedModeAPI::GetFactoryInstance();
|
| extensions::ManagementAPI::GetFactoryInstance();
|
| - extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
|
| + extensions::MediaGalleriesPrivateAPI::GetFactoryInstance();
|
| extensions::OmniboxAPI::GetFactoryInstance();
|
| extensions::PreferenceAPI::GetFactoryInstance();
|
| extensions::ProcessesAPI::GetFactoryInstance();
|
|
|