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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc

Issue 1545283002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer. h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer. h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/thread_task_runner_handle.h" 15 #include "base/thread_task_runner_handle.h"
15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h" 16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"
16 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h" 17 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util. h"
17 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" 18 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
18 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" 19 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 51
51 void SetUp() override { 52 void SetUp() override {
52 ASSERT_TRUE(database_dir_.CreateUniqueTempDir()); 53 ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
53 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default())); 54 in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
54 55
55 scoped_ptr<drive::FakeDriveService> 56 scoped_ptr<drive::FakeDriveService>
56 fake_drive_service(new drive::FakeDriveService); 57 fake_drive_service(new drive::FakeDriveService);
57 fake_drive_service_ = fake_drive_service.get(); 58 fake_drive_service_ = fake_drive_service.get();
58 59
59 sync_context_.reset(new SyncEngineContext( 60 sync_context_.reset(new SyncEngineContext(
60 fake_drive_service.Pass(), 61 std::move(fake_drive_service),
61 scoped_ptr<drive::DriveUploaderInterface>(), 62 scoped_ptr<drive::DriveUploaderInterface>(), nullptr /* task_logger */,
62 nullptr /* task_logger */,
63 base::ThreadTaskRunnerHandle::Get(), 63 base::ThreadTaskRunnerHandle::Get(),
64 base::ThreadTaskRunnerHandle::Get(), 64 base::ThreadTaskRunnerHandle::Get(), nullptr /* worker_pool */));
65 nullptr /* worker_pool */));
66 65
67 sync_task_manager_.reset(new SyncTaskManager( 66 sync_task_manager_.reset(new SyncTaskManager(
68 base::WeakPtr<SyncTaskManager::Client>(), 67 base::WeakPtr<SyncTaskManager::Client>(),
69 1 /* maximum_parallel_task */, 68 1 /* maximum_parallel_task */,
70 base::ThreadTaskRunnerHandle::Get(), 69 base::ThreadTaskRunnerHandle::Get(),
71 nullptr /* worker_pool */)); 70 nullptr /* worker_pool */));
72 sync_task_manager_->Initialize(SYNC_STATUS_OK); 71 sync_task_manager_->Initialize(SYNC_STATUS_OK);
73 } 72 }
74 73
75 void TearDown() override { 74 void TearDown() override {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR; 138 google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
140 scoped_ptr<google_apis::FileResource> entry; 139 scoped_ptr<google_apis::FileResource> entry;
141 drive::AddNewDirectoryOptions options; 140 drive::AddNewDirectoryOptions options;
142 options.visibility = google_apis::drive::FILE_VISIBILITY_PRIVATE; 141 options.visibility = google_apis::drive::FILE_VISIBILITY_PRIVATE;
143 sync_context_->GetDriveService()->AddNewDirectory( 142 sync_context_->GetDriveService()->AddNewDirectory(
144 parent_folder_id, title, options, 143 parent_folder_id, title, options,
145 CreateResultReceiver(&error, &entry)); 144 CreateResultReceiver(&error, &entry));
146 base::RunLoop().RunUntilIdle(); 145 base::RunLoop().RunUntilIdle();
147 146
148 EXPECT_EQ(google_apis::HTTP_CREATED, error); 147 EXPECT_EQ(google_apis::HTTP_CREATED, error);
149 return entry.Pass(); 148 return entry;
150 } 149 }
151 150
152 scoped_ptr<google_apis::FileResource> CreateRemoteSyncRoot() { 151 scoped_ptr<google_apis::FileResource> CreateRemoteSyncRoot() {
153 scoped_ptr<google_apis::FileResource> sync_root( 152 scoped_ptr<google_apis::FileResource> sync_root(
154 CreateRemoteFolder(std::string(), kSyncRootFolderTitle)); 153 CreateRemoteFolder(std::string(), kSyncRootFolderTitle));
155 154
156 for (size_t i = 0; i < sync_root->parents().size(); ++i) { 155 for (size_t i = 0; i < sync_root->parents().size(); ++i) {
157 google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR; 156 google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
158 sync_context_->GetDriveService()->RemoveResourceFromDirectory( 157 sync_context_->GetDriveService()->RemoveResourceFromDirectory(
159 sync_root->parents()[i].file_id(), 158 sync_root->parents()[i].file_id(),
160 sync_root->file_id(), 159 sync_root->file_id(),
161 CreateResultReceiver(&error)); 160 CreateResultReceiver(&error));
162 base::RunLoop().RunUntilIdle(); 161 base::RunLoop().RunUntilIdle();
163 EXPECT_EQ(google_apis::HTTP_NO_CONTENT, error); 162 EXPECT_EQ(google_apis::HTTP_NO_CONTENT, error);
164 } 163 }
165 164
166 return sync_root.Pass(); 165 return sync_root;
167 } 166 }
168 167
169 std::string GetSyncRootFolderID() { 168 std::string GetSyncRootFolderID() {
170 int64_t sync_root_tracker_id = metadata_database_->GetSyncRootTrackerID(); 169 int64_t sync_root_tracker_id = metadata_database_->GetSyncRootTrackerID();
171 FileTracker sync_root_tracker; 170 FileTracker sync_root_tracker;
172 EXPECT_TRUE(metadata_database_->FindTrackerByTrackerID( 171 EXPECT_TRUE(metadata_database_->FindTrackerByTrackerID(
173 sync_root_tracker_id, &sync_root_tracker)); 172 sync_root_tracker_id, &sync_root_tracker));
174 return sync_root_tracker.file_id(); 173 return sync_root_tracker.file_id();
175 } 174 }
176 175
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 359
361 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id())); 360 EXPECT_EQ(0u, CountTrackersForFile(sync_root->file_id()));
362 EXPECT_FALSE(HasNoParent(sync_root->file_id())); 361 EXPECT_FALSE(HasNoParent(sync_root->file_id()));
363 362
364 EXPECT_EQ(1u, CountFileMetadata()); 363 EXPECT_EQ(1u, CountFileMetadata());
365 EXPECT_EQ(1u, CountFileTracker()); 364 EXPECT_EQ(1u, CountFileTracker());
366 } 365 }
367 366
368 } // namespace drive_backend 367 } // namespace drive_backend
369 } // namespace sync_file_system 368 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698