Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

 /*
  * Copyright (c) 2013, 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 27 matching lines @@
 #include "platform/SharedBuffer.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/graphics/Image.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLResponse.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 static Vector<unsigned char> jpegImage()
 {
     Vector<unsigned char> jpeg;
 
     static const unsigned char data[] = {
         0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00,
         0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
@@ skipping 43 matching lines @@
 
     virtual ~ImageResourceTestMockFetchContext() { }
 
     bool allowImage(bool imagesEnabled, const KURL&) const override { return true; }
     bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const override { return true; }
     bool shouldLoadNewResource(Resource::Type) const override { return true; }
     WebTaskRunner* loadingTaskRunner() const override { return m_runner.get(); }
 
 private:
     ImageResourceTestMockFetchContext()
-        :  m_runner(wrapUnique(new MockTaskRunner))
+        :  m_runner(adoptPtr(new MockTaskRunner))
     { }
 
-    std::unique_ptr<MockTaskRunner> m_runner;
+    OwnPtr<MockTaskRunner> m_runner;
 };
 
 TEST(ImageResourceTest, MultipartImage)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
 
     // Emulate starting a real load, but don't expect any "real" WebURLLoaderClient callbacks.
     ImageResource* cachedImage = ImageResource::create(ResourceRequest(testURL));
@@ skipping 170 matching lines @@
     cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg.data()), jpeg.size(), jpeg.size());
     cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg.size());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
 }
 
 } // namespace blink