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

Unified Diff: third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.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/origin_trials/OriginTrialContextTest.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
index 60294933f41b895141b24bd274cb53ed2e38de78..5d3701633029aa171c6c420cbed2c13a05ab96b4 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
@@ -18,7 +18,9 @@
#include "public/platform/WebOriginTrialTokenStatus.h"
#include "public/platform/WebTrialTokenValidator.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/PtrUtil.h"
#include "wtf/Vector.h"
+#include <memory>
namespace blink {
namespace {
@@ -79,7 +81,7 @@ protected:
OriginTrialContextTest()
: m_frameworkWasEnabled(RuntimeEnabledFeatures::originTrialsEnabled())
, m_executionContext(new NullExecutionContext())
- , m_tokenValidator(adoptPtr(new MockTokenValidator()))
+ , m_tokenValidator(wrapUnique(new MockTokenValidator()))
, m_originTrialContext(new OriginTrialContext(m_executionContext.get(), m_tokenValidator.get()))
, m_histogramTester(new HistogramTester())
{
@@ -139,7 +141,7 @@ protected:
private:
const bool m_frameworkWasEnabled;
Persistent<NullExecutionContext> m_executionContext;
- OwnPtr<MockTokenValidator> m_tokenValidator;
+ std::unique_ptr<MockTokenValidator> m_tokenValidator;
Persistent<OriginTrialContext> m_originTrialContext;
std::unique_ptr<HistogramTester> m_histogramTester;
};

Powered by Google App Engine
This is Rietveld 408576698