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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerThreadTest.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
Index: third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
index 3552cf927b834b91d47569669584e1f36398c09c..e1c372ddc055f09fd98790154171ddfbbd056038 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
@@ -8,6 +8,8 @@
#include "platform/testing/UnitTestHelpers.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/PtrUtil.h"
+#include <memory>
using testing::_;
using testing::AtMost;
@@ -18,10 +20,10 @@ class WorkerThreadTest : public ::testing::Test {
public:
void SetUp() override
{
- m_mockWorkerLoaderProxyProvider = adoptPtr(new MockWorkerLoaderProxyProvider());
- m_mockWorkerReportingProxy = adoptPtr(new MockWorkerReportingProxy());
+ m_mockWorkerLoaderProxyProvider = wrapUnique(new MockWorkerLoaderProxyProvider());
+ m_mockWorkerReportingProxy = wrapUnique(new MockWorkerReportingProxy());
m_securityOrigin = SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
- m_workerThread = adoptPtr(new WorkerThreadForTest(
+ m_workerThread = wrapUnique(new WorkerThreadForTest(
m_mockWorkerLoaderProxyProvider.get(),
*m_mockWorkerReportingProxy));
m_mockWorkerThreadLifecycleObserver = new MockWorkerThreadLifecycleObserver(m_workerThread->getWorkerThreadLifecycleContext());
@@ -83,9 +85,9 @@ protected:
}
RefPtr<SecurityOrigin> m_securityOrigin;
- OwnPtr<MockWorkerLoaderProxyProvider> m_mockWorkerLoaderProxyProvider;
- OwnPtr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
- OwnPtr<WorkerThreadForTest> m_workerThread;
+ std::unique_ptr<MockWorkerLoaderProxyProvider> m_mockWorkerLoaderProxyProvider;
+ std::unique_ptr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
+ std::unique_ptr<WorkerThreadForTest> m_workerThread;
Persistent<MockWorkerThreadLifecycleObserver> m_mockWorkerThreadLifecycleObserver;
};

Powered by Google App Engine
This is Rietveld 408576698