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

Unified Diff: components/sync_driver/sync_api_component_factory_mock.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_mock.h
diff --git a/components/sync_driver/sync_api_component_factory_mock.h b/components/sync_driver/sync_api_component_factory_mock.h
index 2ebca5ef3fc4109581a90fdecc69c4a95ecc3dfc..3f4ad829ee44430cb03f280b5f5297e8885fa852 100644
--- a/components/sync_driver/sync_api_component_factory_mock.h
+++ b/components/sync_driver/sync_api_component_factory_mock.h
@@ -5,7 +5,8 @@
#ifndef COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_MOCK_H__
#define COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_MOCK_H__
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "components/sync_driver/data_type_controller.h"
#include "components/sync_driver/data_type_error_handler.h"
#include "components/sync_driver/sync_api_component_factory.h"
@@ -46,13 +47,13 @@ class SyncApiComponentFactoryMock
const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
const base::FilePath& sync_folder));
- scoped_ptr<sync_driver::LocalDeviceInfoProvider>
- CreateLocalDeviceInfoProvider() override;
+ std::unique_ptr<sync_driver::LocalDeviceInfoProvider>
+ CreateLocalDeviceInfoProvider() override;
void SetLocalDeviceInfoProvider(
- scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device);
+ std::unique_ptr<sync_driver::LocalDeviceInfoProvider> local_device);
- scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
- scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
+ 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,
@@ -69,11 +70,11 @@ class SyncApiComponentFactoryMock
private:
sync_driver::SyncApiComponentFactory::SyncComponents MakeSyncComponents();
- scoped_ptr<sync_driver::AssociatorInterface> model_associator_;
- scoped_ptr<sync_driver::ChangeProcessor> change_processor_;
+ std::unique_ptr<sync_driver::AssociatorInterface> model_associator_;
+ std::unique_ptr<sync_driver::ChangeProcessor> change_processor_;
// LocalDeviceInfoProvider is initially owned by this class,
// transferred to caller when CreateLocalDeviceInfoProvider is called.
- scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
+ std::unique_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
};
#endif // COMPONENTS_SYNC_DRIVER_SYNC_API_COMPONENT_FACTORY_MOCK_H__
« no previous file with comments | « components/sync_driver/sync_api_component_factory.h ('k') | components/sync_driver/sync_api_component_factory_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698