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

Unified Diff: components/sync_driver/generic_change_processor.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: 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/generic_change_processor.h
diff --git a/components/sync_driver/generic_change_processor.h b/components/sync_driver/generic_change_processor.h
index 29e7edda2abcb1073639b32441ab767a0511fef2..3db4a92140f66bd131cf8e47789eb914052e2faf 100644
--- a/components/sync_driver/generic_change_processor.h
+++ b/components/sync_driver/generic_change_processor.h
@@ -7,12 +7,12 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "components/sync_driver/change_processor.h"
@@ -60,7 +60,7 @@ class GenericChangeProcessor : public ChangeProcessor,
const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
syncer::UserShare* user_share,
SyncClient* sync_client,
- scoped_ptr<syncer::AttachmentStoreForSync> attachment_store);
+ std::unique_ptr<syncer::AttachmentStoreForSync> attachment_store);
~GenericChangeProcessor() override;
// ChangeProcessor interface.
@@ -105,7 +105,7 @@ class GenericChangeProcessor : public ChangeProcessor,
virtual bool CryptoReadyIfNecessary();
// Gets AttachmentService proxy for datatype.
- scoped_ptr<syncer::AttachmentService> GetAttachmentService() const;
+ std::unique_ptr<syncer::AttachmentService> GetAttachmentService() const;
protected:
// ChangeProcessor interface.
@@ -164,12 +164,12 @@ class GenericChangeProcessor : public ChangeProcessor,
// AttachmentService for datatype. Can be NULL if datatype doesn't use
// attachments.
- scoped_ptr<syncer::AttachmentService> attachment_service_;
+ std::unique_ptr<syncer::AttachmentService> attachment_service_;
// Must be destroyed before attachment_service_ to ensure WeakPtrs are
// invalidated before attachment_service_ is destroyed.
// Can be NULL if attachment_service_ is NULL;
- scoped_ptr<base::WeakPtrFactory<syncer::AttachmentService> >
+ std::unique_ptr<base::WeakPtrFactory<syncer::AttachmentService>>
attachment_service_weak_ptr_factory_;
syncer::AttachmentServiceProxy attachment_service_proxy_;
base::WeakPtrFactory<GenericChangeProcessor> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698