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

Unified Diff: components/sync_driver/sync_api_component_factory.h

Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix, address feedback 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: components/sync_driver/sync_api_component_factory.h
diff --git a/components/sync_driver/sync_api_component_factory.h b/components/sync_driver/sync_api_component_factory.h
index b2d9d782a8e52e03ce38fe4981f5a8e7df451ecf..19c69552e4c33aec2ae7f8b649ad941db08da08e 100644
--- a/components/sync_driver/sync_api_component_factory.h
+++ b/components/sync_driver/sync_api_component_factory.h
@@ -5,9 +5,9 @@
#ifndef COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_
#define COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_H_
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/sync_driver/data_type_controller.h"
#include "sync/api/syncable_service.h"
@@ -111,8 +111,8 @@ class SyncApiComponentFactory {
const base::FilePath& sync_folder) = 0;
// Creating this in the factory helps us mock it out in testing.
- virtual scoped_ptr<sync_driver::LocalDeviceInfoProvider>
- CreateLocalDeviceInfoProvider() = 0;
+ virtual std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
+ CreateLocalDeviceInfoProvider() = 0;
// Legacy datatypes that need to be converted to the SyncableService API.
virtual SyncComponents CreateBookmarkSyncComponents(
@@ -130,8 +130,8 @@ class SyncApiComponentFactory {
// asynchronous events (AttachmentUploaded). Pass NULL if delegate is not
// provided. AttachmentService doesn't take ownership of delegate, the pointer
// must be valid throughout AttachmentService lifetime.
- virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
- scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
+ virtual std::unique_ptr<syncer::AttachmentService> CreateAttachmentService(
+ std::unique_ptr<syncer::AttachmentStoreForSync> attachment_store,
const syncer::UserShare& user_share,
const std::string& store_birthday,
syncer::ModelType model_type,
« no previous file with comments | « components/sync_driver/startup_controller_unittest.cc ('k') | components/sync_driver/sync_api_component_factory_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698