Commit 1875561a authored by tzik's avatar tzik Committed by Commit Bot

Use base::MakeRefCounted for FakeWebTaskRunner construction

This allows base::MakeRefCounted() on Blink, and converts FakeWebTaskRunner
construction to use base::MakeRefCounted(), so that FakeWebTaskRunner
can switch to the zero-started ref count. That is needed to switch it
to a subclass of base::SingleThreadTaskRunner.

Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Id8701c9cce10eea8a4d1254eee31c9e6ffc8ff5b
Reviewed-on: https://chromium-review.googlesource.com/778500Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518629}
parent 54952baf
...@@ -39,7 +39,7 @@ class FrameCaretTest : public EditingTestBase { ...@@ -39,7 +39,7 @@ class FrameCaretTest : public EditingTestBase {
TEST_F(FrameCaretTest, BlinkAfterTyping) { TEST_F(FrameCaretTest, BlinkAfterTyping) {
FrameCaret& caret = Selection().FrameCaretForTesting(); FrameCaret& caret = Selection().FrameCaretForTesting();
scoped_refptr<scheduler::FakeWebTaskRunner> task_runner = scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
base::AdoptRef(new scheduler::FakeWebTaskRunner); base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
task_runner->SetTime(0); task_runner->SetTime(0);
caret.RecreateCaretBlinkTimerForTesting(task_runner.get()); caret.RecreateCaretBlinkTimerForTesting(task_runner.get());
const double kInterval = 10; const double kInterval = 10;
......
...@@ -39,7 +39,7 @@ class CancellationTestHelper { ...@@ -39,7 +39,7 @@ class CancellationTestHelper {
TEST(WebTaskRunnerTest, PostCancellableTaskTest) { TEST(WebTaskRunnerTest, PostCancellableTaskTest) {
scoped_refptr<scheduler::FakeWebTaskRunner> task_runner = scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
base::AdoptRef(new scheduler::FakeWebTaskRunner); base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
// Run without cancellation. // Run without cancellation.
int count = 0; int count = 0;
...@@ -120,7 +120,7 @@ TEST(WebTaskRunnerTest, PostCancellableTaskTest) { ...@@ -120,7 +120,7 @@ TEST(WebTaskRunnerTest, PostCancellableTaskTest) {
TEST(WebTaskRunnerTest, CancellationCheckerTest) { TEST(WebTaskRunnerTest, CancellationCheckerTest) {
scoped_refptr<scheduler::FakeWebTaskRunner> task_runner = scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
base::AdoptRef(new scheduler::FakeWebTaskRunner); base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
int count = 0; int count = 0;
TaskHandle handle = task_runner->PostCancellableTask( TaskHandle handle = task_runner->PostCancellableTask(
......
...@@ -471,7 +471,7 @@ TEST_F(BitmapImageTestWithMockDecoder, DontAdvanceToIncompleteFrame) { ...@@ -471,7 +471,7 @@ TEST_F(BitmapImageTestWithMockDecoder, DontAdvanceToIncompleteFrame) {
image_->SetData(SharedBuffer::Create("data", sizeof("data")), true); image_->SetData(SharedBuffer::Create("data", sizeof("data")), true);
scoped_refptr<scheduler::FakeWebTaskRunner> task_runner = scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
base::AdoptRef(new scheduler::FakeWebTaskRunner); base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
image_->SetTaskRunnerForTesting(task_runner); image_->SetTaskRunnerForTesting(task_runner);
task_runner->SetTime(10); task_runner->SetTime(10);
...@@ -506,7 +506,7 @@ TEST_F(BitmapImageTestWithMockDecoder, FrameSkipTracking) { ...@@ -506,7 +506,7 @@ TEST_F(BitmapImageTestWithMockDecoder, FrameSkipTracking) {
image_->SetData(SharedBuffer::Create("data", sizeof("data")), false); image_->SetData(SharedBuffer::Create("data", sizeof("data")), false);
scoped_refptr<scheduler::FakeWebTaskRunner> task_runner = scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
base::AdoptRef(new scheduler::FakeWebTaskRunner); base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
image_->SetTaskRunnerForTesting(task_runner); image_->SetTaskRunnerForTesting(task_runner);
task_runner->SetTime(10); task_runner->SetTime(10);
......
...@@ -115,7 +115,7 @@ class MockFetchContext : public FetchContext { ...@@ -115,7 +115,7 @@ class MockFetchContext : public FetchContext {
MockFetchContext(LoadPolicy load_policy) MockFetchContext(LoadPolicy load_policy)
: load_policy_(load_policy), : load_policy_(load_policy),
runner_(base::AdoptRef(new scheduler::FakeWebTaskRunner)), runner_(base::MakeRefCounted<scheduler::FakeWebTaskRunner>()),
security_origin_(SecurityOrigin::CreateUnique()), security_origin_(SecurityOrigin::CreateUnique()),
frame_scheduler_(new MockFrameScheduler(runner_)), frame_scheduler_(new MockFrameScheduler(runner_)),
complete_(false), complete_(false),
......
...@@ -162,8 +162,8 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver { ...@@ -162,8 +162,8 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
class NetworkStateNotifierTest : public ::testing::Test { class NetworkStateNotifierTest : public ::testing::Test {
public: public:
NetworkStateNotifierTest() NetworkStateNotifierTest()
: task_runner_(base::AdoptRef(new FakeWebTaskRunner())), : task_runner_(base::MakeRefCounted<FakeWebTaskRunner>()),
task_runner2_(base::AdoptRef(new FakeWebTaskRunner())) { task_runner2_(base::MakeRefCounted<FakeWebTaskRunner>()) {
// Initialize connection, so that future calls to setWebConnection issue // Initialize connection, so that future calls to setWebConnection issue
// notifications. // notifications.
notifier_.SetWebConnection(kWebConnectionTypeUnknown, 0.0); notifier_.SetWebConnection(kWebConnectionTypeUnknown, 0.0);
......
...@@ -31,6 +31,7 @@ _CONFIG = [ ...@@ -31,6 +31,7 @@ _CONFIG = [
# //base constructs that are allowed everywhere # //base constructs that are allowed everywhere
'base::AdoptRef', 'base::AdoptRef',
'base::MakeRefCounted',
'base::Optional', 'base::Optional',
'base::SingleThreadTaskRunner', 'base::SingleThreadTaskRunner',
'base::UnguessableToken', 'base::UnguessableToken',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment