Revert "Remove OwnPtr from Blink."

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 30 matching lines @@
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/MathExtras.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 #include <algorithm>
-#include <memory>
 
 namespace blink {
 
 // These response headers are not copied from a revalidated response to the
 // cached response headers. For compatibility, this list is based on Chromium's
 // net/http/http_response_headers.cc.
 const char* const headersToIgnoreAfterRevalidation[] = {
     "allow",
     "connection",
     "etag",
@@ skipping 168 matching lines @@
 public:
     static ResourceCallback& callbackHandler();
     DECLARE_TRACE();
     void schedule(Resource*);
     void cancel(Resource*);
     bool isScheduled(Resource*) const;
 private:
     ResourceCallback();
 
     void runTask();
-    std::unique_ptr<CancellableTaskFactory> m_callbackTaskFactory;
+    OwnPtr<CancellableTaskFactory> m_callbackTaskFactory;
     HeapHashSet<Member<Resource>> m_resourcesWithPendingClients;
 };
 
 Resource::ResourceCallback& Resource::ResourceCallback::callbackHandler()
 {
     // Oilpan + LSan: as the callbackHandler() singleton is used by Resource
     // and ResourcePtr finalizers, it cannot be released upon shutdown in
     // preparation for leak detection.
     //
     // Keep it out of LSan's reach instead.
@@ skipping 310 matching lines @@
     if (!memoryCache()->contains(this) || hasClientsOrObservers() || !isLoaded() || !isSafeToUnlock())
         return false;
 
     if (RuntimeEnabledFeatures::doNotUnlockSharedBufferEnabled())
         return false;
 
     m_data->unlock();
     return true;
 }
 
-void Resource::responseReceived(const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle>)
+void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle>)
 {
     m_responseTimestamp = currentTime();
     if (m_preloadDiscoveryTime) {
         int timeSinceDiscovery = static_cast<int>(1000 * (monotonicallyIncreasingTime() - m_preloadDiscoveryTime));
         DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDiscoveryToFirstByteHistogram, ("PreloadScanner.TTFB", 0, 10000, 50));
         preloadDiscoveryToFirstByteHistogram.count(timeSinceDiscovery);
     }
 
     if (m_isRevalidating) {
         if (response.httpStatusCode() == 304) {
@@ skipping 546 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink