chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc - Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc

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

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc

index df45a5455c5d574b443ebb93136d5fdf792cf272..0c6ee5efb67d5417568d84c7fbc3e596be6b205a 100644

--- a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc

+++ b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.cc

@@ -4,8 +4,9 @@

#include "chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.h"

+#include <memory>

#include "base/files/file_path.h"

-#include "base/memory/scoped_ptr.h"

#include "base/strings/string_util.h"

#include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"

#include "storage/common/fileapi/file_system_types.h"

@@ -41,7 +42,8 @@ SyncStatusCode MigrateDatabaseFromV4ToV3(leveldb::DB* db) {

leveldb::WriteBatch write_batch;

write_batch.Put(kDatabaseVersionKey, "3");

- scoped_ptr<leveldb::Iterator> itr(db->NewIterator(leveldb::ReadOptions()));

+ std::unique_ptr<leveldb::Iterator> itr(

+ db->NewIterator(leveldb::ReadOptions()));

for (itr->SeekToFirst(); itr->Valid(); itr->Next()) {

std::string key = itr->key().ToString();