Skip to content

Commit d76713f

Browse files
jdoerrieCommit Bot
jdoerrie
authored and
Commit Bot
committed
[base] Run PassedToMoveRewriter on other platforms
Following r753559 this change applies the PassedToMoveRewriter on Android, CrOS and Windows. Furthermore, it adds includes for the <utility> header in files where it was missing. TBR=dcheng Bug: 714018 Change-Id: Ia49cdaa30cfebe14f75081e2c935a6242510700f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2124385 Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#754881}
1 parent 8b34a3d commit d76713f

File tree

67 files changed

+186
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+186
-185
lines changed

‎ash/login/login_screen_controller.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void LoginScreenController::AuthenticateUserWithPasswordOrPin(
118118
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
119119
FROM_HERE,
120120
base::BindOnce(&LoginScreenController::OnAuthenticateComplete,
121-
weak_factory_.GetWeakPtr(), base::Passed(&callback),
121+
weak_factory_.GetWeakPtr(), std::move(callback),
122122
false),
123123
base::TimeDelta::FromSeconds(1));
124124
return;
@@ -133,7 +133,7 @@ void LoginScreenController::AuthenticateUserWithPasswordOrPin(
133133
client_->AuthenticateUserWithPasswordOrPin(
134134
account_id, password, is_pin,
135135
base::BindOnce(&LoginScreenController::OnAuthenticateComplete,
136-
weak_factory_.GetWeakPtr(), base::Passed(&callback)));
136+
weak_factory_.GetWeakPtr(), std::move(callback)));
137137
}
138138

139139
void LoginScreenController::AuthenticateUserWithExternalBinary(

‎ash/rotator/screen_rotation_animator.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "ash/rotator/screen_rotation_animator.h"
66

77
#include <memory>
8+
#include <utility>
89

910
#include "ash/public/cpp/ash_switches.h"
1011
#include "ash/public/cpp/shell_window_ids.h"
@@ -281,7 +282,7 @@ ScreenRotationAnimator::CreateAfterCopyCallbackBeforeRotation(
281282
return base::BindOnce(&ScreenRotationAnimator::
282283
OnScreenRotationContainerLayerCopiedBeforeRotation,
283284
weak_factory_.GetWeakPtr(),
284-
base::Passed(&rotation_request));
285+
std::move(rotation_request));
285286
}
286287

287288
ScreenRotationAnimator::CopyCallback
@@ -290,7 +291,7 @@ ScreenRotationAnimator::CreateAfterCopyCallbackAfterRotation(
290291
return base::BindOnce(&ScreenRotationAnimator::
291292
OnScreenRotationContainerLayerCopiedAfterRotation,
292293
weak_factory_.GetWeakPtr(),
293-
base::Passed(&rotation_request));
294+
std::move(rotation_request));
294295
}
295296

296297
void ScreenRotationAnimator::OnScreenRotationContainerLayerCopiedBeforeRotation(

‎ash/shelf/shelf_view.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <algorithm>
88
#include <memory>
9+
#include <utility>
910

1011
#include "ash/app_list/app_list_controller_impl.h"
1112
#include "ash/drag_drop/drag_image_view.h"
@@ -660,8 +661,7 @@ void ShelfView::ButtonPressed(views::Button* sender,
660661
model_->GetShelfItemDelegate(item.id)->ItemSelected(
661662
ui::Event::Clone(event), GetDisplayIdForView(this), LAUNCH_FROM_SHELF,
662663
base::BindOnce(&ShelfView::AfterItemSelected, weak_factory_.GetWeakPtr(),
663-
item, sender, base::Passed(ui::Event::Clone(event)),
664-
ink_drop));
664+
item, sender, ui::Event::Clone(event), ink_drop));
665665
}
666666

667667
bool ShelfView::IsShowingMenuForView(const views::View* view) const {

‎ash/wallpaper/wallpaper_controller_impl.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,7 @@ void OnWallpaperDataRead(LoadedCallback callback,
288288
bool read_is_successful) {
289289
if (!read_is_successful) {
290290
base::ThreadTaskRunnerHandle::Get()->PostTask(
291-
FROM_HERE,
292-
base::BindOnce(std::move(callback), base::Passed(gfx::ImageSkia())));
291+
FROM_HERE, base::BindOnce(std::move(callback), gfx::ImageSkia()));
293292
return;
294293
}
295294
// This image was once encoded to JPEG by |ResizeAndEncodeImage|.
@@ -1645,7 +1644,7 @@ void WallpaperControllerImpl::ReadAndDecodeWallpaper(
16451644
task_runner.get(), FROM_HERE,
16461645
base::BindOnce(&base::ReadFileToString, file_path, data),
16471646
base::BindOnce(&OnWallpaperDataRead, std::move(callback),
1648-
base::Passed(base::WrapUnique(data))));
1647+
base::WrapUnique(data)));
16491648
}
16501649

16511650
bool WallpaperControllerImpl::InitializeUserWallpaperInfo(

‎chrome/browser/android/vr/gvr_scheduler_delegate.cc

+4-5
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void GvrSchedulerDelegate::SubmitDrawnFrame(FrameType frame_type,
549549
base::Unretained(this)));
550550
task_runner()->PostTask(
551551
FROM_HERE, base::BindOnce(webxr_delayed_gvr_submit_.callback(),
552-
frame_type, head_pose, base::Passed(&fence)));
552+
frame_type, head_pose, std::move(fence)));
553553
} else {
554554
// Continue with submit immediately.
555555
DrawFrameSubmitNow(frame_type, head_pose);
@@ -584,13 +584,12 @@ void GvrSchedulerDelegate::DrawFrameSubmitWhenReady(
584584
task_runner()->PostDelayedTask(
585585
FROM_HERE,
586586
base::BindOnce(webxr_delayed_gvr_submit_.callback(), frame_type,
587-
head_pose, base::Passed(&fence)),
587+
head_pose, std::move(fence)),
588588
kWebVRFenceCheckPollInterval);
589589
} else {
590590
task_runner()->PostTask(
591-
FROM_HERE,
592-
base::BindOnce(webxr_delayed_gvr_submit_.callback(), frame_type,
593-
head_pose, base::Passed(&fence)));
591+
FROM_HERE, base::BindOnce(webxr_delayed_gvr_submit_.callback(),
592+
frame_type, head_pose, std::move(fence)));
594593
}
595594
return;
596595
}

‎chrome/browser/chromeos/customization/customization_document.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,7 @@ void ServicesCustomizationDocument::CheckAndApplyWallpaper() {
873873
base::Unretained(exists.get()));
874874
base::OnceClosure on_checked_closure = base::BindOnce(
875875
&ServicesCustomizationDocument::OnCheckedWallpaperCacheExists,
876-
weak_ptr_factory_.GetWeakPtr(), base::Passed(std::move(exists)),
877-
std::move(applying));
876+
weak_ptr_factory_.GetWeakPtr(), std::move(exists), std::move(applying));
878877
base::ThreadPool::PostTaskAndReply(
879878
FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
880879
std::move(check_file_exists), std::move(on_checked_closure));

‎chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ ExtensionFunction::ResponseAction AutotestPrivateTakeScreenshotFunction::Run() {
19651965
grabber->TakeScreenshot(
19661966
primary_root, primary_root->bounds(),
19671967
base::BindOnce(&AutotestPrivateTakeScreenshotFunction::ScreenshotTaken,
1968-
this, base::Passed(&grabber)));
1968+
this, std::move(grabber)));
19691969
return RespondLater();
19701970
}
19711971

@@ -2008,7 +2008,7 @@ AutotestPrivateTakeScreenshotForDisplayFunction::Run() {
20082008
window, window->bounds(),
20092009
base::BindOnce(
20102010
&AutotestPrivateTakeScreenshotForDisplayFunction::ScreenshotTaken,
2011-
this, base::Passed(&grabber)));
2011+
this, std::move(grabber)));
20122012
return RespondLater();
20132013
}
20142014
}

‎chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ AbortCallback FakeProvidedFileSystem::GetMetadata(
139139
}
140140

141141
return PostAbortableTask(base::BindOnce(
142-
std::move(callback), base::Passed(&metadata), base::File::FILE_OK));
142+
std::move(callback), std::move(metadata), base::File::FILE_OK));
143143
}
144144

145145
AbortCallback FakeProvidedFileSystem::GetActions(

‎chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc

+5-6
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,10 @@ class FileStreamReader::OperationRunner
102102

103103
// If the file system got unmounted, then abort the get length operation.
104104
if (!file_system_.get()) {
105-
base::PostTask(
106-
FROM_HERE, {BrowserThread::IO},
107-
base::BindOnce(std::move(callback),
108-
base::Passed(base::WrapUnique<EntryMetadata>(NULL)),
109-
base::File::FILE_ERROR_ABORT));
105+
base::PostTask(FROM_HERE, {BrowserThread::IO},
106+
base::BindOnce(std::move(callback),
107+
base::WrapUnique<EntryMetadata>(NULL),
108+
base::File::FILE_ERROR_ABORT));
110109
return;
111110
}
112111

@@ -166,7 +165,7 @@ class FileStreamReader::OperationRunner
166165

167166
base::PostTask(
168167
FROM_HERE, {BrowserThread::IO},
169-
base::BindOnce(std::move(callback), base::Passed(&metadata), result));
168+
base::BindOnce(std::move(callback), std::move(metadata), result));
170169
}
171170

172171
// Forwards a response of reading from a file to the IO thread.

‎chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc

+17-18
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h"
66

77
#include <algorithm>
8+
#include <utility>
89

910
#include "base/bind.h"
1011
#include "base/callback.h"
@@ -328,11 +329,10 @@ void ProviderAsyncFileUtil::EnsureFileExists(
328329
const storage::FileSystemURL& url,
329330
EnsureFileExistsCallback callback) {
330331
DCHECK_CURRENTLY_ON(BrowserThread::IO);
331-
base::PostTask(
332-
FROM_HERE, {BrowserThread::UI},
333-
base::BindOnce(&CreateFileOnUIThread, base::Passed(&context), url,
334-
base::BindOnce(&OnCreateFileForEnsureFileExists,
335-
std::move(callback))));
332+
base::PostTask(FROM_HERE, {BrowserThread::UI},
333+
base::BindOnce(&CreateFileOnUIThread, std::move(context), url,
334+
base::BindOnce(&OnCreateFileForEnsureFileExists,
335+
std::move(callback))));
336336
}
337337

338338
void ProviderAsyncFileUtil::CreateDirectory(
@@ -342,12 +342,11 @@ void ProviderAsyncFileUtil::CreateDirectory(
342342
bool recursive,
343343
StatusCallback callback) {
344344
DCHECK_CURRENTLY_ON(BrowserThread::IO);
345-
base::PostTask(
346-
FROM_HERE, {BrowserThread::UI},
347-
base::BindOnce(
348-
&CreateDirectoryOnUIThread, base::Passed(&context), url, exclusive,
349-
recursive,
350-
base::BindOnce(&OnCreateDirectory, exclusive, std::move(callback))));
345+
base::PostTask(FROM_HERE, {BrowserThread::UI},
346+
base::BindOnce(&CreateDirectoryOnUIThread, std::move(context),
347+
url, exclusive, recursive,
348+
base::BindOnce(&OnCreateDirectory, exclusive,
349+
std::move(callback))));
351350
}
352351

353352
void ProviderAsyncFileUtil::GetFileInfo(
@@ -359,7 +358,7 @@ void ProviderAsyncFileUtil::GetFileInfo(
359358
base::PostTask(
360359
FROM_HERE, {BrowserThread::UI},
361360
base::BindOnce(
362-
&GetFileInfoOnUIThread, base::Passed(&context), url, fields,
361+
&GetFileInfoOnUIThread, std::move(context), url, fields,
363362
base::Bind(&OnGetFileInfo, fields, base::Passed(&callback))));
364363
}
365364

@@ -392,7 +391,7 @@ void ProviderAsyncFileUtil::Truncate(
392391
DCHECK_CURRENTLY_ON(BrowserThread::IO);
393392
base::PostTask(
394393
FROM_HERE, {BrowserThread::UI},
395-
base::BindOnce(&TruncateOnUIThread, base::Passed(&context), url, length,
394+
base::BindOnce(&TruncateOnUIThread, std::move(context), url, length,
396395
base::BindOnce(&OnTruncate, std::move(callback))));
397396
}
398397

@@ -408,7 +407,7 @@ void ProviderAsyncFileUtil::CopyFileLocal(
408407
// time) as well as the progress callback.
409408
base::PostTask(
410409
FROM_HERE, {BrowserThread::UI},
411-
base::BindOnce(&CopyEntryOnUIThread, base::Passed(&context), src_url,
410+
base::BindOnce(&CopyEntryOnUIThread, std::move(context), src_url,
412411
dest_url,
413412
base::BindOnce(&OnCopyEntry, std::move(callback))));
414413
}
@@ -424,7 +423,7 @@ void ProviderAsyncFileUtil::MoveFileLocal(
424423
// time) as well as the progress callback.
425424
base::PostTask(
426425
FROM_HERE, {BrowserThread::UI},
427-
base::BindOnce(&MoveEntryOnUIThread, base::Passed(&context), src_url,
426+
base::BindOnce(&MoveEntryOnUIThread, std::move(context), src_url,
428427
dest_url,
429428
base::BindOnce(&OnMoveEntry, std::move(callback))));
430429
}
@@ -445,7 +444,7 @@ void ProviderAsyncFileUtil::DeleteFile(
445444
DCHECK_CURRENTLY_ON(BrowserThread::IO);
446445
base::PostTask(
447446
FROM_HERE, {BrowserThread::UI},
448-
base::BindOnce(&DeleteEntryOnUIThread, base::Passed(&context), url,
447+
base::BindOnce(&DeleteEntryOnUIThread, std::move(context), url,
449448
false, // recursive
450449
base::BindOnce(&OnDeleteEntry, std::move(callback))));
451450
}
@@ -457,7 +456,7 @@ void ProviderAsyncFileUtil::DeleteDirectory(
457456
DCHECK_CURRENTLY_ON(BrowserThread::IO);
458457
base::PostTask(
459458
FROM_HERE, {BrowserThread::UI},
460-
base::BindOnce(&DeleteEntryOnUIThread, base::Passed(&context), url,
459+
base::BindOnce(&DeleteEntryOnUIThread, std::move(context), url,
461460
false, // recursive
462461
base::BindOnce(&OnDeleteEntry, std::move(callback))));
463462
}
@@ -469,7 +468,7 @@ void ProviderAsyncFileUtil::DeleteRecursively(
469468
DCHECK_CURRENTLY_ON(BrowserThread::IO);
470469
base::PostTask(
471470
FROM_HERE, {BrowserThread::UI},
472-
base::BindOnce(&DeleteEntryOnUIThread, base::Passed(&context), url,
471+
base::BindOnce(&DeleteEntryOnUIThread, std::move(context), url,
473472
true, // recursive
474473
base::BindOnce(&OnDeleteEntry, std::move(callback))));
475474
}

‎chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

+4-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void RunCallbackOnTaskRunner(
4343
const base::Callback<void(crypto::ScopedPK11Slot)>& callback,
4444
crypto::ScopedPK11Slot slot) {
4545
response_task_runner->PostTask(FROM_HERE,
46-
base::BindOnce(callback, base::Passed(&slot)));
46+
base::BindOnce(callback, std::move(slot)));
4747
}
4848

4949
// Gets TPM system slot. Must be called on IO thread.
@@ -340,9 +340,8 @@ void EasyUnlockTpmKeyManager::CreateKeyInSystemSlot(
340340
base::ThreadPool::PostTask(
341341
FROM_HERE,
342342
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
343-
base::BindOnce(&CreateTpmKeyPairOnWorkerThread,
344-
base::Passed(&system_slot), public_key,
345-
base::ThreadTaskRunnerHandle::Get(),
343+
base::BindOnce(&CreateTpmKeyPairOnWorkerThread, std::move(system_slot),
344+
public_key, base::ThreadTaskRunnerHandle::Get(),
346345
base::Bind(&EasyUnlockTpmKeyManager::OnTpmKeyCreated,
347346
weak_ptr_factory_.GetWeakPtr())));
348347
}
@@ -358,7 +357,7 @@ void EasyUnlockTpmKeyManager::SignDataWithSystemSlot(
358357
base::ThreadPool::PostTask(
359358
FROM_HERE,
360359
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
361-
base::BindOnce(&SignDataOnWorkerThread, base::Passed(&system_slot),
360+
base::BindOnce(&SignDataOnWorkerThread, std::move(system_slot),
362361
public_key, data, base::ThreadTaskRunnerHandle::Get(),
363362
base::Bind(&EasyUnlockTpmKeyManager::OnDataSigned,
364363
weak_ptr_factory_.GetWeakPtr(), callback)));

‎chrome/browser/chromeos/login/users/avatar/user_image_loader.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,8 @@ void DecodeImage(
221221
if (!data_is_ready) {
222222
base::ThreadTaskRunnerHandle::Get()->PostTask(
223223
FROM_HERE,
224-
base::BindOnce(
225-
std::move(image_info.loaded_cb),
226-
base::Passed(base::WrapUnique(new user_manager::UserImage))));
224+
base::BindOnce(std::move(image_info.loaded_cb),
225+
base::WrapUnique(new user_manager::UserImage)));
227226
return;
228227
}
229228

‎chrome/browser/chromeos/platform_keys/platform_keys_service_nss.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class SelectCertificatesState : public NSSOperationState {
302302
std::unique_ptr<net::CertificateList> matches,
303303
const std::string& error_message) {
304304
auto bound_callback =
305-
base::BindOnce(callback_, base::Passed(&matches), error_message);
305+
base::BindOnce(callback_, std::move(matches), error_message);
306306
origin_task_runner_->PostTask(
307307
from, base::BindOnce(&NSSOperationState::RunCallback,
308308
std::move(bound_callback), service_weak_ptr_));
@@ -333,7 +333,7 @@ class GetCertificatesState : public NSSOperationState {
333333
std::unique_ptr<net::CertificateList> certs,
334334
const std::string& error_message) {
335335
auto bound_callback =
336-
base::BindOnce(callback_, base::Passed(&certs), error_message);
336+
base::BindOnce(callback_, std::move(certs), error_message);
337337
origin_task_runner_->PostTask(
338338
from, base::BindOnce(&NSSOperationState::RunCallback,
339339
std::move(bound_callback), service_weak_ptr_));
@@ -415,7 +415,7 @@ class GetTokensState : public NSSOperationState {
415415
std::unique_ptr<std::vector<std::string>> token_ids,
416416
const std::string& error_message) {
417417
auto bound_callback =
418-
base::BindOnce(callback_, base::Passed(&token_ids), error_message);
418+
base::BindOnce(callback_, std::move(token_ids), error_message);
419419
origin_task_runner_->PostTask(
420420
from, base::BindOnce(&NSSOperationState::RunCallback,
421421
std::move(bound_callback), service_weak_ptr_));

‎chrome/browser/chromeos/policy/cloud_external_data_manager_base.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void CloudExternalDataManagerBase::Backend::RunCallback(
342342
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
343343
callback_task_runner_->PostTask(
344344
FROM_HERE,
345-
base::BindOnce(std::move(callback), base::Passed(&data), file_path));
345+
base::BindOnce(std::move(callback), std::move(data), file_path));
346346
}
347347

348348
void CloudExternalDataManagerBase::Backend::StartDownload(
@@ -389,7 +389,7 @@ void CloudExternalDataManagerBase::SetExternalDataStore(
389389
backend_task_runner_->PostTask(
390390
FROM_HERE, base::BindOnce(&Backend::SetExternalDataStore,
391391
base::Unretained(backend_.get()),
392-
base::Passed(&external_data_store)));
392+
std::move(external_data_store)));
393393
}
394394

395395
void CloudExternalDataManagerBase::SetPolicyStore(
@@ -427,9 +427,9 @@ void CloudExternalDataManagerBase::OnPolicyStoreLoaded() {
427427
}
428428

429429
backend_task_runner_->PostTask(
430-
FROM_HERE, base::BindOnce(&Backend::OnMetadataUpdated,
431-
base::Unretained(backend_.get()),
432-
base::Passed(&metadata)));
430+
FROM_HERE,
431+
base::BindOnce(&Backend::OnMetadataUpdated,
432+
base::Unretained(backend_.get()), std::move(metadata)));
433433
}
434434

435435
void CloudExternalDataManagerBase::Connect(

‎chrome/browser/chromeos/policy/status_collector/status_collector_state.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include "chrome/browser/chromeos/policy/status_collector/status_collector_state.h"
66

7+
#include <utility>
8+
79
#include "base/bind.h"
810
#include "base/task/post_task.h"
911
#include "base/task/task_traits.h"
@@ -22,7 +24,7 @@ StatusCollectorParams& StatusCollectorState::response_params() {
2224
// Protected.
2325
StatusCollectorState::~StatusCollectorState() {
2426
task_runner_->PostTask(
25-
FROM_HERE, base::BindOnce(response_, base::Passed(&response_params_)));
27+
FROM_HERE, base::BindOnce(response_, std::move(response_params_)));
2628
}
2729

2830
} // namespace policy

0 commit comments

Comments
 (0)