third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp - Issue 2050123002: Remove OwnPtr from Blink.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/threading/BackgroundTaskRunner.h ('k') | third_party/WebKit/Source/platform/transforms/TransformationMatrix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp

diff --git a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp

index ec1e6240d6cab20bb0078569c89f15d418a56b16..25f8536203780c5f33dba07a1dfe1c9a52d8cbe7 100644

--- a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp

+++ b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp

@@ -8,6 +8,8 @@

#include "platform/WaitableEvent.h"

#include "public/platform/WebTraceLocation.h"

#include "testing/gtest/include/gtest/gtest.h"

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace {

@@ -24,7 +26,7 @@ class BackgroundTaskRunnerTest : public testing::Test {

TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread)

{

- OwnPtr<WaitableEvent> doneEvent = adoptPtr(new WaitableEvent());

+ std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());

BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::TaskSizeShortRunningTask);

// Test passes by not hanging on the following wait().

doneEvent->wait();

@@ -32,7 +34,7 @@ TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread)

TEST_F(BackgroundTaskRunnerTest, RunLongTaskOnBackgroundThread)

{

- OwnPtr<WaitableEvent> doneEvent = adoptPtr(new WaitableEvent());

+ std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());

BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::TaskSizeLongRunningTask);

// Test passes by not hanging on the following wait().

doneEvent->wait();