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

Unified Diff: components/sync_driver/glue/sync_backend_host_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/glue/sync_backend_host_mock.h
diff --git a/components/sync_driver/glue/sync_backend_host_mock.h b/components/sync_driver/glue/sync_backend_host_mock.h
index c21785b530a71d5a9baf045472ba726ad3087002..4b7a52f925d22d84b6c646d516c9692f17e35dc8 100644
--- a/components/sync_driver/glue/sync_backend_host_mock.h
+++ b/components/sync_driver/glue/sync_backend_host_mock.h
@@ -27,7 +27,7 @@ class SyncBackendHostMock : public SyncBackendHost {
void Initialize(
sync_driver::SyncFrontend* frontend,
- scoped_ptr<base::Thread> sync_thread,
+ std::unique_ptr<base::Thread> sync_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& file_thread,
const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
@@ -35,13 +35,13 @@ class SyncBackendHostMock : public SyncBackendHost {
const std::string& sync_user_agent,
const syncer::SyncCredentials& credentials,
bool delete_sync_data_folder,
- scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
+ std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory,
const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
unrecoverable_error_handler,
const base::Closure& report_unrecoverable_error_function,
const HttpPostProviderFactoryGetter& http_post_provider_factory_getter,
- scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state)
- override;
+ std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>
+ saved_nigori_state) override;
void TriggerRefresh(const syncer::ModelTypeSet& types) override;
@@ -56,7 +56,8 @@ class SyncBackendHostMock : public SyncBackendHost {
void StopSyncingForShutdown() override;
- scoped_ptr<base::Thread> Shutdown(syncer::ShutdownReason reason) override;
+ std::unique_ptr<base::Thread> Shutdown(
+ syncer::ShutdownReason reason) override;
void UnregisterInvalidationIds() override;
@@ -77,7 +78,7 @@ class SyncBackendHostMock : public SyncBackendHost {
void ActivateNonBlockingDataType(
syncer::ModelType type,
- scoped_ptr<syncer_v2::ActivationContext>) override;
+ std::unique_ptr<syncer_v2::ActivationContext>) override;
void DeactivateNonBlockingDataType(syncer::ModelType type) override;
syncer::UserShare* GetUserShare() const override;
« no previous file with comments | « components/sync_driver/glue/sync_backend_host_impl_unittest.cc ('k') | components/sync_driver/glue/sync_backend_host_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698