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

Unified Diff: sync/internal_api/public/attachments/attachment_service_proxy_for_test.h

Issue 1866243002: Convert //sync 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: sync/internal_api/public/attachments/attachment_service_proxy_for_test.h
diff --git a/sync/internal_api/public/attachments/attachment_service_proxy_for_test.h b/sync/internal_api/public/attachments/attachment_service_proxy_for_test.h
index 811c97d3c2b7a3055bf117d40de8aa8e92cdedfd..ca8f8009300e14f48245a9a7a27b2ee206ea00a8 100644
--- a/sync/internal_api/public/attachments/attachment_service_proxy_for_test.h
+++ b/sync/internal_api/public/attachments/attachment_service_proxy_for_test.h
@@ -5,8 +5,9 @@
#ifndef SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_SERVICE_PROXY_FOR_TEST_H_
#define SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_SERVICE_PROXY_FOR_TEST_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "sync/base/sync_export.h"
#include "sync/internal_api/public/attachments/attachment_service_proxy.h"
@@ -28,16 +29,16 @@ class SYNC_EXPORT AttachmentServiceProxyForTest
// A Core that owns the wrapped AttachmentService.
class OwningCore : public AttachmentServiceProxy::Core {
public:
- OwningCore(
- scoped_ptr<AttachmentService>,
- scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory);
+ OwningCore(std::unique_ptr<AttachmentService>,
+ std::unique_ptr<base::WeakPtrFactory<AttachmentService>>
+ weak_ptr_factory);
private:
~OwningCore() override;
- scoped_ptr<AttachmentService> wrapped_;
+ std::unique_ptr<AttachmentService> wrapped_;
// WeakPtrFactory for wrapped_. See Create() for why this is a scoped_ptr.
- scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory_;
+ std::unique_ptr<base::WeakPtrFactory<AttachmentService>> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(OwningCore);
};

Powered by Google App Engine
This is Rietveld 408576698