Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp

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 5d3701633029aa171c6c420cbed2c13a05ab96b4..60294933f41b895141b24bd274cb53ed2e38de78 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
@@ -18,9 +18,7 @@
 #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 {
@@ -81,7 +79,7 @@ protected:
     OriginTrialContextTest()
         : m_frameworkWasEnabled(RuntimeEnabledFeatures::originTrialsEnabled())
         , m_executionContext(new NullExecutionContext())
-        , m_tokenValidator(wrapUnique(new MockTokenValidator()))
+        , m_tokenValidator(adoptPtr(new MockTokenValidator()))
         , m_originTrialContext(new OriginTrialContext(m_executionContext.get(), m_tokenValidator.get()))
         , m_histogramTester(new HistogramTester())
     {
@@ -141,7 +139,7 @@ protected:
 private:
     const bool m_frameworkWasEnabled;
     Persistent<NullExecutionContext> m_executionContext;
-    std::unique_ptr<MockTokenValidator> m_tokenValidator;
+    OwnPtr<MockTokenValidator> m_tokenValidator;
     Persistent<OriginTrialContext> m_originTrialContext;
     std::unique_ptr<HistogramTester> m_histogramTester;
 };