Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, 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 30 matching lines @@
 #include "core/loader/EmptyClients.h"
 #include "core/page/Page.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <memory>
 
 namespace blink {
 
 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
 public:
     static StubFrameLoaderClientWithParent* create(Frame* parent)
     {
         return new StubFrameLoaderClientWithParent(parent);
     }
 
@@ skipping 54 matching lines @@
         childFrame = LocalFrame::create(childClient.get(), document->frame()->host(), owner.get());
         childFrame->setView(FrameView::create(childFrame.get(), IntSize(500, 500)));
         childFrame->init();
         childDocumentLoader = DocumentLoader::create(childFrame.get(), ResourceRequest("http://www.example.com"), SubstituteData());
         childDocument = childFrame->document();
         FrameFetchContext* childFetchContext = static_cast<FrameFetchContext*>(&childDocumentLoader->fetcher()->context());
         FrameFetchContext::provideDocumentToContext(*childFetchContext, childDocument.get());
         return childFetchContext;
     }
 
-    std::unique_ptr<DummyPageHolder> dummyPageHolder;
+    OwnPtr<DummyPageHolder> dummyPageHolder;
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
     Persistent<DocumentLoader> documentLoader;
     Persistent<Document> document;
     Persistent<FrameFetchContext> fetchContext;
 
     Persistent<StubFrameLoaderClientWithParent> childClient;
     Persistent<LocalFrame> childFrame;
     Persistent<DocumentLoader> childDocumentLoader;
     Persistent<Document> childDocument;
@@ skipping 493 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
     }
 }
 
 } // namespace blink