Index: ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc |
diff --git a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc |
index ff57860417a6a669ddde41cf98b5c602faa4d37e..b96e022c183d71eb26f085253859e08b227a150e 100644 |
--- a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc |
+++ b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.cc |
@@ -4,6 +4,7 @@ |
#include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/singleton.h" |
#include "components/keyed_service/ios/browser_state_dependency_manager.h" |
#include "components/sessions/core/persistent_tab_restore_service.h" |
@@ -12,13 +13,14 @@ |
namespace { |
-scoped_ptr<KeyedService> BuildTabRestoreService(web::BrowserState* context) { |
+std::unique_ptr<KeyedService> BuildTabRestoreService( |
+ web::BrowserState* context) { |
DCHECK(!context->IsOffTheRecord()); |
ios::ChromeBrowserState* browser_state = |
ios::ChromeBrowserState::FromBrowserState(context); |
- return make_scoped_ptr(new sessions::PersistentTabRestoreService( |
- make_scoped_ptr(new IOSChromeTabRestoreServiceClient(browser_state)), |
+ return base::WrapUnique(new sessions::PersistentTabRestoreService( |
+ base::WrapUnique(new IOSChromeTabRestoreServiceClient(browser_state)), |
nullptr)); |
} |
@@ -55,7 +57,7 @@ bool IOSChromeTabRestoreServiceFactory::ServiceIsNULLWhileTesting() const { |
return true; |
} |
-scoped_ptr<KeyedService> |
+std::unique_ptr<KeyedService> |
IOSChromeTabRestoreServiceFactory::BuildServiceInstanceFor( |
web::BrowserState* context) const { |
return BuildTabRestoreService(context); |