| Index: chrome/browser/sessions/tab_restore_service_factory.cc
|
| diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc
|
| index 28d15fac5b021afa52ecf612a10ae74360bb15ec..d1abc0a45dc06260ad2c8f39f33c6672474e614c 100644
|
| --- a/chrome/browser/sessions/tab_restore_service_factory.cc
|
| +++ b/chrome/browser/sessions/tab_restore_service_factory.cc
|
| @@ -15,15 +15,16 @@
|
| #endif
|
|
|
| // static
|
| -TabRestoreService* TabRestoreServiceFactory::GetForProfile(Profile* profile) {
|
| - return static_cast<TabRestoreService*>(
|
| +sessions::TabRestoreService* TabRestoreServiceFactory::GetForProfile(
|
| + Profile* profile) {
|
| + return static_cast<sessions::TabRestoreService*>(
|
| GetInstance()->GetServiceForBrowserContext(profile, true));
|
| }
|
|
|
| // static
|
| -TabRestoreService* TabRestoreServiceFactory::GetForProfileIfExisting(
|
| +sessions::TabRestoreService* TabRestoreServiceFactory::GetForProfileIfExisting(
|
| Profile* profile) {
|
| - return static_cast<TabRestoreService*>(
|
| + return static_cast<sessions::TabRestoreService*>(
|
| GetInstance()->GetServiceForBrowserContext(profile, false));
|
| }
|
|
|
| @@ -40,9 +41,8 @@ TabRestoreServiceFactory* TabRestoreServiceFactory::GetInstance() {
|
|
|
| TabRestoreServiceFactory::TabRestoreServiceFactory()
|
| : BrowserContextKeyedServiceFactory(
|
| - "TabRestoreService",
|
| - BrowserContextDependencyManager::GetInstance()) {
|
| -}
|
| + "sessions::TabRestoreService",
|
| + BrowserContextDependencyManager::GetInstance()) {}
|
|
|
| TabRestoreServiceFactory::~TabRestoreServiceFactory() {
|
| }
|
| @@ -59,8 +59,8 @@ KeyedService* TabRestoreServiceFactory::BuildServiceInstanceFor(
|
| new ChromeTabRestoreServiceClient(profile));
|
|
|
| #if defined(OS_ANDROID)
|
| - return new InMemoryTabRestoreService(client.Pass(), nullptr);
|
| + return new sessions::InMemoryTabRestoreService(client.Pass(), nullptr);
|
| #else
|
| - return new PersistentTabRestoreService(client.Pass(), nullptr);
|
| + return new sessions::PersistentTabRestoreService(client.Pass(), nullptr);
|
| #endif
|
| }
|
|
|