| Index: chrome/browser/sync_file_system/drive_backend/fake_sync_worker.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.cc
|
| index f447e11cec4e10fe079ab82ac8a09db3f4db3cda..7cffd98f0d432b0f6718d88d4dcd52d14e249288 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.cc
|
| @@ -24,7 +24,7 @@ FakeSyncWorker::~FakeSyncWorker() {
|
| }
|
|
|
| void FakeSyncWorker::Initialize(
|
| - scoped_ptr<SyncEngineContext> sync_engine_context) {
|
| + std::unique_ptr<SyncEngineContext> sync_engine_context) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
|
|
| sync_engine_context_ = std::move(sync_engine_context);
|
| @@ -85,8 +85,8 @@ void FakeSyncWorker::GetOriginStatusMap(
|
| const RemoteFileSyncService::StatusMapCallback& callback) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
|
|
| - scoped_ptr<RemoteFileSyncService::OriginStatusMap>
|
| - status_map(new RemoteFileSyncService::OriginStatusMap);
|
| + std::unique_ptr<RemoteFileSyncService::OriginStatusMap> status_map(
|
| + new RemoteFileSyncService::OriginStatusMap);
|
| for (StatusMap::const_iterator itr = status_map_.begin();
|
| itr != status_map_.end(); ++itr) {
|
| switch (itr->second) {
|
| @@ -110,12 +110,12 @@ void FakeSyncWorker::GetOriginStatusMap(
|
| callback.Run(std::move(status_map));
|
| }
|
|
|
| -scoped_ptr<base::ListValue> FakeSyncWorker::DumpFiles(const GURL& origin) {
|
| +std::unique_ptr<base::ListValue> FakeSyncWorker::DumpFiles(const GURL& origin) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
| return nullptr;
|
| }
|
|
|
| -scoped_ptr<base::ListValue> FakeSyncWorker::DumpDatabase() {
|
| +std::unique_ptr<base::ListValue> FakeSyncWorker::DumpDatabase() {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
| return nullptr;
|
| }
|
|
|