Skip to content

Commit 94048e8

Browse files
Mark PilgrimCommit Bot
Mark Pilgrim
authored and
Commit Bot
committed
Appcache: BindOnce refactoring
Make AppCacheResponseTest::PushNextTask take a base::OnceClosure instead of base::Closure Bug: 714018 Change-Id: Ib58ce581ac9ee7f5d5a589998f451ec3fabf237e Reviewed-on: https://chromium-review.googlesource.com/646187 Reviewed-by: Michael Nordman <[email protected]> Commit-Queue: Mark Pilgrim <[email protected]> Cr-Commit-Position: refs/heads/master@{#499097}
1 parent 6bf35f0 commit 94048e8

File tree

1 file changed

+86
-78
lines changed

1 file changed

+86
-78
lines changed

‎content/browser/appcache/appcache_response_unittest.cc

Lines changed: 86 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ class AppCacheResponseTest : public testing::Test {
139139
test_finished_event_->Signal();
140140
}
141141

142-
void PushNextTask(base::Closure task) {
142+
void PushNextTask(base::OnceClosure task) {
143143
task_stack_.push(
144144
std::pair<base::OnceClosure, bool>(std::move(task), false));
145145
}
146146

147-
void PushNextTaskAsImmediate(const base::Closure& task) {
147+
void PushNextTaskAsImmediate(base::OnceClosure task) {
148148
task_stack_.push(std::pair<base::OnceClosure, bool>(std::move(task), true));
149149
}
150150

@@ -181,8 +181,8 @@ class AppCacheResponseTest : public testing::Test {
181181
IOBuffer* body, int body_len) {
182182
DCHECK(body);
183183
scoped_refptr<IOBuffer> body_ref(body);
184-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteResponseBody,
185-
base::Unretained(this), body_ref, body_len));
184+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteResponseBody,
185+
base::Unretained(this), body_ref, body_len));
186186
WriteResponseHead(head);
187187
}
188188

@@ -329,10 +329,10 @@ class AppCacheResponseTest : public testing::Test {
329329
service_->storage()->CreateResponseReader(GURL(), kNoSuchResponseId));
330330

331331
// Push tasks in reverse order
332-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadNonExistentData,
333-
base::Unretained(this)));
334-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadNonExistentInfo,
335-
base::Unretained(this)));
332+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadNonExistentData,
333+
base::Unretained(this)));
334+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadNonExistentInfo,
335+
base::Unretained(this)));
336336
ScheduleNextTask();
337337
}
338338

@@ -359,8 +359,9 @@ class AppCacheResponseTest : public testing::Test {
359359

360360
// LoadResponseInfo_Miss ----------------------------------------------------
361361
void LoadResponseInfo_Miss() {
362-
PushNextTask(base::Bind(&AppCacheResponseTest::LoadResponseInfo_Miss_Verify,
363-
base::Unretained(this)));
362+
PushNextTask(
363+
base::BindOnce(&AppCacheResponseTest::LoadResponseInfo_Miss_Verify,
364+
base::Unretained(this)));
364365
service_->storage()->LoadResponseInfo(GURL(), kNoSuchResponseId,
365366
storage_delegate_.get());
366367
}
@@ -378,17 +379,19 @@ class AppCacheResponseTest : public testing::Test {
378379
// a. headers
379380
// b. body
380381
// 2. Use LoadResponseInfo to read the response headers back out
381-
PushNextTask(base::Bind(&AppCacheResponseTest::LoadResponseInfo_Hit_Step2,
382-
base::Unretained(this)));
382+
PushNextTask(
383+
base::BindOnce(&AppCacheResponseTest::LoadResponseInfo_Hit_Step2,
384+
base::Unretained(this)));
383385
writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
384386
written_response_id_ = writer_->response_id();
385387
WriteBasicResponse();
386388
}
387389

388390
void LoadResponseInfo_Hit_Step2() {
389391
writer_.reset();
390-
PushNextTask(base::Bind(&AppCacheResponseTest::LoadResponseInfo_Hit_Verify,
391-
base::Unretained(this)));
392+
PushNextTask(
393+
base::BindOnce(&AppCacheResponseTest::LoadResponseInfo_Hit_Verify,
394+
base::Unretained(this)));
392395
service_->storage()->LoadResponseInfo(GURL(), written_response_id_,
393396
storage_delegate_.get());
394397
}
@@ -418,26 +421,29 @@ class AppCacheResponseTest : public testing::Test {
418421
// 7. Check metadata was deleted.
419422

420423
// Push tasks in reverse order.
421-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_VerifyMetadata,
422-
base::Unretained(this), ""));
423-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_LoadResponseInfo,
424-
base::Unretained(this)));
425-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_WriteMetadata,
426-
base::Unretained(this), ""));
427-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_VerifyMetadata,
428-
base::Unretained(this), "Second"));
429-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_LoadResponseInfo,
430-
base::Unretained(this)));
431-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_WriteMetadata,
432-
base::Unretained(this), "Second"));
433-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_VerifyMetadata,
434-
base::Unretained(this), "Metadata First"));
435-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_LoadResponseInfo,
436-
base::Unretained(this)));
437-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_WriteMetadata,
438-
base::Unretained(this), "Metadata First"));
439-
PushNextTask(base::Bind(&AppCacheResponseTest::Metadata_ResetWriter,
440-
base::Unretained(this)));
424+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_VerifyMetadata,
425+
base::Unretained(this), ""));
426+
PushNextTask(
427+
base::BindOnce(&AppCacheResponseTest::Metadata_LoadResponseInfo,
428+
base::Unretained(this)));
429+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_WriteMetadata,
430+
base::Unretained(this), ""));
431+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_VerifyMetadata,
432+
base::Unretained(this), "Second"));
433+
PushNextTask(
434+
base::BindOnce(&AppCacheResponseTest::Metadata_LoadResponseInfo,
435+
base::Unretained(this)));
436+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_WriteMetadata,
437+
base::Unretained(this), "Second"));
438+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_VerifyMetadata,
439+
base::Unretained(this), "Metadata First"));
440+
PushNextTask(
441+
base::BindOnce(&AppCacheResponseTest::Metadata_LoadResponseInfo,
442+
base::Unretained(this)));
443+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_WriteMetadata,
444+
base::Unretained(this), "Metadata First"));
445+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Metadata_ResetWriter,
446+
base::Unretained(this)));
441447
writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
442448
written_response_id_ = writer_->response_id();
443449
WriteBasicResponse();
@@ -495,14 +501,15 @@ class AppCacheResponseTest : public testing::Test {
495501
GetHttpResponseInfoSize(head) + kNumBlocks * kBlockSize;
496502

497503
// Push tasks in reverse order.
498-
PushNextTask(base::Bind(&AppCacheResponseTest::Verify_AmountWritten,
499-
base::Unretained(this), expected_amount_written));
504+
PushNextTask(base::BindOnce(&AppCacheResponseTest::Verify_AmountWritten,
505+
base::Unretained(this),
506+
expected_amount_written));
500507
for (int i = 0; i < kNumBlocks; ++i) {
501-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteOneBlock,
502-
base::Unretained(this), kNumBlocks - i));
508+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteOneBlock,
509+
base::Unretained(this), kNumBlocks - i));
503510
}
504-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteResponseHead,
505-
base::Unretained(this), head));
511+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteResponseHead,
512+
base::Unretained(this), head));
506513

507514
writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
508515
written_response_id_ = writer_->response_id();
@@ -528,22 +535,23 @@ class AppCacheResponseTest : public testing::Test {
528535
// 6. Attempt to read beyond EOF of a range.
529536

530537
// Push tasks in reverse order
531-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadRangeFullyBeyondEOF,
532-
base::Unretained(this)));
533-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadRangePartiallyBeyondEOF,
534-
base::Unretained(this)));
535-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadPastEOF,
536-
base::Unretained(this)));
537-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadRange,
538-
base::Unretained(this)));
539-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadPastEOF,
540-
base::Unretained(this)));
541-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadAllAtOnce,
542-
base::Unretained(this)));
543-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadInBlocks,
544-
base::Unretained(this)));
545-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteOutBlocks,
546-
base::Unretained(this)));
538+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadRangeFullyBeyondEOF,
539+
base::Unretained(this)));
540+
PushNextTask(
541+
base::BindOnce(&AppCacheResponseTest::ReadRangePartiallyBeyondEOF,
542+
base::Unretained(this)));
543+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadPastEOF,
544+
base::Unretained(this)));
545+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadRange,
546+
base::Unretained(this)));
547+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadPastEOF,
548+
base::Unretained(this)));
549+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadAllAtOnce,
550+
base::Unretained(this)));
551+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadInBlocks,
552+
base::Unretained(this)));
553+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteOutBlocks,
554+
base::Unretained(this)));
547555

548556
// Get them going.
549557
ScheduleNextTask();
@@ -553,8 +561,8 @@ class AppCacheResponseTest : public testing::Test {
553561
writer_.reset(service_->storage()->CreateResponseWriter(GURL()));
554562
written_response_id_ = writer_->response_id();
555563
for (int i = 0; i < kNumBlocks; ++i) {
556-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteOneBlock,
557-
base::Unretained(this), kNumBlocks - i));
564+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteOneBlock,
565+
base::Unretained(this), kNumBlocks - i));
558566
}
559567
ScheduleNextTask();
560568
}
@@ -571,15 +579,15 @@ class AppCacheResponseTest : public testing::Test {
571579
reader_.reset(service_->storage()->CreateResponseReader(
572580
GURL(), written_response_id_));
573581
for (int i = 0; i < kNumBlocks; ++i) {
574-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadOneBlock,
575-
base::Unretained(this), kNumBlocks - i));
582+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadOneBlock,
583+
base::Unretained(this), kNumBlocks - i));
576584
}
577585
ScheduleNextTask();
578586
}
579587

580588
void ReadOneBlock(int block_number) {
581-
PushNextTask(base::Bind(&AppCacheResponseTest::VerifyOneBlock,
582-
base::Unretained(this), block_number));
589+
PushNextTask(base::BindOnce(&AppCacheResponseTest::VerifyOneBlock,
590+
base::Unretained(this), block_number));
583591
ReadResponseBody(new IOBuffer(kBlockSize), kBlockSize);
584592
}
585593

@@ -589,8 +597,8 @@ class AppCacheResponseTest : public testing::Test {
589597
}
590598

591599
void ReadAllAtOnce() {
592-
PushNextTask(base::Bind(&AppCacheResponseTest::VerifyAllAtOnce,
593-
base::Unretained(this)));
600+
PushNextTask(base::BindOnce(&AppCacheResponseTest::VerifyAllAtOnce,
601+
base::Unretained(this)));
594602
reader_.reset(service_->storage()->CreateResponseReader(
595603
GURL(), written_response_id_));
596604
int big_size = kNumBlocks * kBlockSize;
@@ -615,8 +623,8 @@ class AppCacheResponseTest : public testing::Test {
615623
}
616624

617625
void ReadRange() {
618-
PushNextTask(base::Bind(&AppCacheResponseTest::VerifyRange,
619-
base::Unretained(this)));
626+
PushNextTask(base::BindOnce(&AppCacheResponseTest::VerifyRange,
627+
base::Unretained(this)));
620628
reader_.reset(service_->storage()->CreateResponseReader(
621629
GURL(), written_response_id_));
622630
reader_->SetReadRange(kBlockSize, kBlockSize);
@@ -629,8 +637,8 @@ class AppCacheResponseTest : public testing::Test {
629637
}
630638

631639
void ReadRangePartiallyBeyondEOF() {
632-
PushNextTask(base::Bind(&AppCacheResponseTest::VerifyRangeBeyondEOF,
633-
base::Unretained(this)));
640+
PushNextTask(base::BindOnce(&AppCacheResponseTest::VerifyRangeBeyondEOF,
641+
base::Unretained(this)));
634642
reader_.reset(service_->storage()->CreateResponseReader(
635643
GURL(), written_response_id_));
636644
reader_->SetReadRange(kBlockSize, kNumBlocks * kBlockSize);
@@ -712,10 +720,10 @@ class AppCacheResponseTest : public testing::Test {
712720
should_delete_writer_in_completion_callback_ = true;
713721
writer_deletion_count_down_ = kNumBlocks;
714722

715-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadInBlocks,
716-
base::Unretained(this)));
717-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteOutBlocks,
718-
base::Unretained(this)));
723+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadInBlocks,
724+
base::Unretained(this)));
725+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteOutBlocks,
726+
base::Unretained(this)));
719727
ScheduleNextTask();
720728
}
721729

@@ -724,12 +732,12 @@ class AppCacheResponseTest : public testing::Test {
724732
// 1. Write a few blocks normally.
725733
// 2. Start a write, delete with it pending.
726734
// 3. Start a read, delete with it pending.
727-
PushNextTask(base::Bind(&AppCacheResponseTest::ReadThenDelete,
728-
base::Unretained(this)));
729-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteThenDelete,
730-
base::Unretained(this)));
731-
PushNextTask(base::Bind(&AppCacheResponseTest::WriteOutBlocks,
732-
base::Unretained(this)));
735+
PushNextTask(base::BindOnce(&AppCacheResponseTest::ReadThenDelete,
736+
base::Unretained(this)));
737+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteThenDelete,
738+
base::Unretained(this)));
739+
PushNextTask(base::BindOnce(&AppCacheResponseTest::WriteOutBlocks,
740+
base::Unretained(this)));
733741
ScheduleNextTask();
734742
}
735743

0 commit comments

Comments
 (0)