Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: ios/chrome/browser/sync/ios_chrome_sync_client.h

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
Index: ios/chrome/browser/sync/ios_chrome_sync_client.h
diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.h b/ios/chrome/browser/sync/ios_chrome_sync_client.h
index 3708fdffe97ba2097794e2dde80d8c3ffb98d4c3..2a5fafa9135bb40846491214e4680cf377daa0c5 100644
--- a/ios/chrome/browser/sync/ios_chrome_sync_client.h
+++ b/ios/chrome/browser/sync/ios_chrome_sync_client.h
@@ -5,6 +5,7 @@
#ifndef IOS_CHROME_BROWSER_SYNC_IOS_CHROME_SYNC_CLIENT_H__
#define IOS_CHROME_BROWSER_SYNC_IOS_CHROME_SYNC_CLIENT_H__
+#include <memory>
#include <vector>
#include "base/macros.h"
@@ -59,7 +60,7 @@ class IOSChromeSyncClient : public sync_driver::SyncClient {
sync_driver::SyncApiComponentFactory* GetSyncApiComponentFactory() override;
void SetSyncApiComponentFactoryForTesting(
- scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory);
+ std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory);
// Iterates over browser states and returns any trackers that can be found.
static void GetDeviceInfoTrackers(
@@ -69,14 +70,14 @@ class IOSChromeSyncClient : public sync_driver::SyncClient {
ios::ChromeBrowserState* const browser_state_;
// The sync api component factory in use by this client.
- scoped_ptr<sync_driver::SyncApiComponentFactory> component_factory_;
+ std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory_;
// Members that must be fetched on the UI thread but accessed on their
// respective backend threads.
scoped_refptr<autofill::AutofillWebDataService> web_data_service_;
scoped_refptr<password_manager::PasswordStore> password_store_;
- scoped_ptr<sync_sessions::SyncSessionsClient> sync_sessions_client_;
+ std::unique_ptr<sync_sessions::SyncSessionsClient> sync_sessions_client_;
const scoped_refptr<syncer::ExtensionsActivity> dummy_extensions_activity_;
« no previous file with comments | « ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.cc ('k') | ios/chrome/browser/sync/ios_chrome_sync_client.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698