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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.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_initializer.h
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
index d540690fd59118da0ba14fe18f0e6f6e658e3059..d1e22199a083db67dd1d12eb94874e02db3b6c66 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h
@@ -7,11 +7,11 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
@@ -72,35 +72,34 @@ class SyncEngineInitializer : public SyncTask {
const base::FilePath& database_path,
leveldb::Env* env_override);
~SyncEngineInitializer() override;
- void RunPreflight(scoped_ptr<SyncTaskToken> token) override;
+ void RunPreflight(std::unique_ptr<SyncTaskToken> token) override;
- scoped_ptr<MetadataDatabase> PassMetadataDatabase();
+ std::unique_ptr<MetadataDatabase> PassMetadataDatabase();
private:
typedef base::Callback<void(const SyncStatusCallback& callback)> Task;
- void GetAboutResource(scoped_ptr<SyncTaskToken> token);
+ void GetAboutResource(std::unique_ptr<SyncTaskToken> token);
void DidGetAboutResource(
- scoped_ptr<SyncTaskToken> token,
+ std::unique_ptr<SyncTaskToken> token,
google_apis::DriveApiErrorCode error,
- scoped_ptr<google_apis::AboutResource> about_resource);
- void FindSyncRoot(scoped_ptr<SyncTaskToken> token);
- void DidFindSyncRoot(scoped_ptr<SyncTaskToken> token,
+ std::unique_ptr<google_apis::AboutResource> about_resource);
+ void FindSyncRoot(std::unique_ptr<SyncTaskToken> token);
+ void DidFindSyncRoot(std::unique_ptr<SyncTaskToken> token,
google_apis::DriveApiErrorCode error,
- scoped_ptr<google_apis::FileList> file_list);
- void CreateSyncRoot(scoped_ptr<SyncTaskToken> token);
- void DidCreateSyncRoot(scoped_ptr<SyncTaskToken> token,
+ std::unique_ptr<google_apis::FileList> file_list);
+ void CreateSyncRoot(std::unique_ptr<SyncTaskToken> token);
+ void DidCreateSyncRoot(std::unique_ptr<SyncTaskToken> token,
google_apis::DriveApiErrorCode error,
- scoped_ptr<google_apis::FileResource> entry);
- void DetachSyncRoot(scoped_ptr<SyncTaskToken> token);
- void DidDetachSyncRoot(scoped_ptr<SyncTaskToken> token,
+ std::unique_ptr<google_apis::FileResource> entry);
+ void DetachSyncRoot(std::unique_ptr<SyncTaskToken> token);
+ void DidDetachSyncRoot(std::unique_ptr<SyncTaskToken> token,
google_apis::DriveApiErrorCode error);
- void ListAppRootFolders(scoped_ptr<SyncTaskToken> token);
- void DidListAppRootFolders(
- scoped_ptr<SyncTaskToken> token,
- google_apis::DriveApiErrorCode error,
- scoped_ptr<google_apis::FileList> file_list);
- void PopulateDatabase(scoped_ptr<SyncTaskToken> token);
+ void ListAppRootFolders(std::unique_ptr<SyncTaskToken> token);
+ void DidListAppRootFolders(std::unique_ptr<SyncTaskToken> token,
+ google_apis::DriveApiErrorCode error,
+ std::unique_ptr<google_apis::FileList> file_list);
+ void PopulateDatabase(std::unique_ptr<SyncTaskToken> token);
SyncEngineContext* sync_context_; // Not owned.
leveldb::Env* env_override_;
@@ -110,13 +109,13 @@ class SyncEngineInitializer : public SyncTask {
int find_sync_root_retry_count_;
- scoped_ptr<MetadataDatabase> metadata_database_;
+ std::unique_ptr<MetadataDatabase> metadata_database_;
ScopedVector<google_apis::FileResource> app_root_folders_;
int64_t largest_change_id_;
std::string root_folder_id_;
- scoped_ptr<google_apis::FileResource> sync_root_folder_;
+ std::unique_ptr<google_apis::FileResource> sync_root_folder_;
base::WeakPtrFactory<SyncEngineInitializer> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698