Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/tests/PrerenderingTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebPrerendererClient.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebView.h"
 #include "public/web/WebViewClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
 #include <functional>
 #include <list>
-#include <memory>
 
 using namespace blink;
 using blink::URLTestHelpers::toKURL;
 
 namespace {
 
 WebURL toWebURL(const char* url)
 {
     return WebURL(toKURL(url));
 }
 
 class TestPrerendererClient : public WebPrerendererClient {
 public:
     TestPrerendererClient() { }
     virtual ~TestPrerendererClient() { }
 
     void setExtraDataForNextPrerender(WebPrerender::ExtraData* extraData)
     {
         DCHECK(!m_extraData);
-        m_extraData = wrapUnique(extraData);
+        m_extraData = adoptPtr(extraData);
     }
 
     WebPrerender releaseWebPrerender()
     {
         DCHECK(!m_webPrerenders.empty());
         WebPrerender retval(m_webPrerenders.front());
         m_webPrerenders.pop_front();
         return retval;
     }
 
     bool empty() const
     {
         return m_webPrerenders.empty();
     }
 
     void clear()
     {
         m_webPrerenders.clear();
     }
 
 private:
     // From WebPrerendererClient:
     void willAddPrerender(WebPrerender* prerender) override
     {
-        prerender->setExtraData(m_extraData.release());
+        prerender->setExtraData(m_extraData.leakPtr());
 
         DCHECK(!prerender->isNull());
         m_webPrerenders.push_back(*prerender);
     }
 
-    std::unique_ptr<WebPrerender::ExtraData> m_extraData;
+    OwnPtr<WebPrerender::ExtraData> m_extraData;
     std::list<WebPrerender> m_webPrerenders;
 };
 
 class TestPrerenderingSupport : public WebPrerenderingSupport {
 public:
     TestPrerenderingSupport()
     {
         initialize(this);
     }
 
@@ skipping 378 matching lines @@
     WebPrerender relNextOnly = prerendererClient()->releaseWebPrerender();
     EXPECT_EQ(toWebURL("http://rel-next-only.com/"), relNextOnly.url());
     EXPECT_EQ(PrerenderRelTypeNext, relNextOnly.relTypes());
 
     WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender();
     EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), relNextAndPrerender.url());
     EXPECT_EQ(static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender), relNextAndPrerender.relTypes());
 }
 
 } // namespace