ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc - Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase? Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.h ('k') | ios/chrome/browser/passwords/ios_chrome_password_store_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc

diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc b/ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc

index cb24ecb08cf1bd891fdcbdbe833d6f341ae6ea3a..928cb3e630f5df30a97e10eedb64367c4d47de87 100644

--- a/ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc

+++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_service_factory.cc

@@ -4,6 +4,7 @@

#include "ios/chrome/browser/passwords/ios_chrome_password_manager_setting_migrator_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/password_manager/sync/browser/password_manager_setting_migrator_service.h"

@@ -35,12 +36,12 @@ IOSChromePasswordManagerSettingMigratorServiceFactory::

IOSChromePasswordManagerSettingMigratorServiceFactory::

~IOSChromePasswordManagerSettingMigratorServiceFactory() {}

-scoped_ptr<KeyedService>

+std::unique_ptr<KeyedService>

IOSChromePasswordManagerSettingMigratorServiceFactory::BuildServiceInstanceFor(

web::BrowserState* context) const {

ios::ChromeBrowserState* browser_state =

ios::ChromeBrowserState::FromBrowserState(context);

- return make_scoped_ptr(

+ return base::WrapUnique(

new password_manager::PasswordManagerSettingMigratorService(

browser_state->GetSyncablePrefs()));

}