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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_context.h

Issue 1873683002: Convert //chrome/browser/sync_file_system 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: chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
index 982ea362d7bf8f4f7f8840be6564441de8562975..e86696ac28d98f836a477160b15ac5fa0c794517 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
@@ -5,9 +5,10 @@
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_CONTEXT_H_
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_SYNC_ENGINE_CONTEXT_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
@@ -33,15 +34,15 @@ class MetadataDatabase;
class SyncEngineContext {
public:
SyncEngineContext(
- scoped_ptr<drive::DriveServiceInterface> drive_service,
- scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
+ std::unique_ptr<drive::DriveServiceInterface> drive_service,
+ std::unique_ptr<drive::DriveUploaderInterface> drive_uploader,
TaskLogger* task_logger,
const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
const scoped_refptr<base::SequencedWorkerPool>& worker_pool);
~SyncEngineContext();
- void SetMetadataDatabase(scoped_ptr<MetadataDatabase> metadata_database);
+ void SetMetadataDatabase(std::unique_ptr<MetadataDatabase> metadata_database);
void SetRemoteChangeProcessor(
RemoteChangeProcessor* remote_change_processor);
@@ -54,19 +55,19 @@ class SyncEngineContext {
base::SequencedTaskRunner* GetWorkerTaskRunner();
base::SequencedWorkerPool* GetWorkerPool();
- scoped_ptr<MetadataDatabase> PassMetadataDatabase();
+ std::unique_ptr<MetadataDatabase> PassMetadataDatabase();
void DetachFromSequence();
private:
friend class DriveBackendSyncTest;
- scoped_ptr<drive::DriveServiceInterface> drive_service_;
- scoped_ptr<drive::DriveUploaderInterface> drive_uploader_;
+ std::unique_ptr<drive::DriveServiceInterface> drive_service_;
+ std::unique_ptr<drive::DriveUploaderInterface> drive_uploader_;
base::WeakPtr<TaskLogger> task_logger_;
RemoteChangeProcessor* remote_change_processor_; // Not owned.
- scoped_ptr<MetadataDatabase> metadata_database_;
+ std::unique_ptr<MetadataDatabase> metadata_database_;
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
scoped_refptr<base::SequencedWorkerPool> worker_pool_;

Powered by Google App Engine
This is Rietveld 408576698