Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h

 /*
  * Copyright (C) 2009 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 19 matching lines @@
 
 #ifndef WorkerThreadableLoader_h
 #define WorkerThreadableLoader_h
 
 #include "core/loader/ThreadableLoader.h"
 #include "core/loader/ThreadableLoaderClient.h"
 #include "core/loader/ThreadableLoaderClientWrapper.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/Referrer.h"
 #include "wtf/Functional.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 namespace blink {
 
 class ExecutionContextTask;
 class ResourceError;
 class ResourceRequest;
 class ResourceResponse;
 class WaitableEvent;
 class WorkerGlobalScope;
 class WorkerLoaderProxy;
 struct CrossThreadResourceRequestData;
 
 class WorkerThreadableLoader final : public ThreadableLoader, private ThreadableLoaderClientWrapper::ResourceTimingClient {
     USING_FAST_MALLOC(WorkerThreadableLoader);
 public:
     static void loadResourceSynchronously(WorkerGlobalScope&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
-    static std::unique_ptr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
+    static PassOwnPtr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
     {
-        return wrapUnique(new WorkerThreadableLoader(workerGlobalScope, client, options, resourceLoaderOptions, LoadAsynchronously));
+        return adoptPtr(new WorkerThreadableLoader(workerGlobalScope, client, options, resourceLoaderOptions, LoadAsynchronously));
     }
 
     ~WorkerThreadableLoader() override;
 
     void start(const ResourceRequest&) override;
 
     void overrideTimeout(unsigned long timeout) override;
 
     void cancel() override;
 
@@ skipping 26 matching lines @@
     public:
         // All executed on the worker context's thread.
         MainThreadBridgeBase(PassRefPtr<ThreadableLoaderClientWrapper>, PassRefPtr<WorkerLoaderProxy>);
         virtual void start(const ResourceRequest&, const WorkerGlobalScope&) = 0;
         void overrideTimeout(unsigned long timeoutMilliseconds);
         void cancel();
         void destroy();
 
         // All executed on the main thread.
         void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) final;
-        void didReceiveResponse(unsigned long identifier, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>) final;
+        void didReceiveResponse(unsigned long identifier, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) final;
         void didReceiveData(const char*, unsigned dataLength) final;
         void didDownloadData(int dataLength) final;
         void didReceiveCachedMetadata(const char*, int dataLength) final;
         void didFinishLoading(unsigned long identifier, double finishTime) final;
         void didFail(const ResourceError&) final;
         void didFailAccessControlCheck(const ResourceError&) final;
         void didFailRedirectCheck() final;
         void didReceiveResourceTiming(const ResourceTimingInfo&) final;
 
     protected:
@@ skipping 11 matching lines @@
 
     private:
         // The following methods are overridden by the subclasses to implement
         // code to forward did.* method invocations to the worker context's
         // thread which is specialized for sync and async case respectively.
         virtual void forwardTaskToWorker(std::unique_ptr<ExecutionContextTask>) = 0;
         virtual void forwardTaskToWorkerOnLoaderDone(std::unique_ptr<ExecutionContextTask>) = 0;
 
         // All executed on the main thread.
         void mainThreadCreateLoader(ThreadableLoaderOptions, ResourceLoaderOptions, ExecutionContext*);
-        void mainThreadStart(std::unique_ptr<CrossThreadResourceRequestData>);
+        void mainThreadStart(PassOwnPtr<CrossThreadResourceRequestData>);
         void mainThreadDestroy(ExecutionContext*);
         void mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext*);
         void mainThreadCancel(ExecutionContext*);
 
         // Only to be used on the main thread.
-        std::unique_ptr<ThreadableLoader> m_mainThreadLoader;
+        OwnPtr<ThreadableLoader> m_mainThreadLoader;
 
         // ThreadableLoaderClientWrapper is to be used on the worker context thread.
         // The ref counting is done on either thread:
         // - worker context's thread: held by the tasks
         // - main thread: held by MainThreadBridgeBase
         // Therefore, this must be a ThreadSafeRefCounted.
         RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
         // Used on the worker context thread.
         RefPtr<WorkerLoaderProxy> m_loaderProxy;
@@ skipping 16 matching lines @@
         MainThreadSyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
         void start(const ResourceRequest&, const WorkerGlobalScope&) override;
 
     private:
         ~MainThreadSyncBridge() override;
 
         void forwardTaskToWorker(std::unique_ptr<ExecutionContextTask>) override;
         void forwardTaskToWorkerOnLoaderDone(std::unique_ptr<ExecutionContextTask>) override;
 
         bool m_done;
-        std::unique_ptr<WaitableEvent> m_loaderDoneEvent;
+        OwnPtr<WaitableEvent> m_loaderDoneEvent;
         // Thread-safety: |m_clientTasks| can be written (i.e. Closures are added)
         // on the main thread only before |m_loaderDoneEvent| is signaled and can be read
         // on the worker context thread only after |m_loaderDoneEvent| is signaled.
         Vector<std::unique_ptr<ExecutionContextTask>> m_clientTasks;
         Mutex m_lock;
     };
 
     WorkerThreadableLoader(WorkerGlobalScope&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, BlockingBehavior);
 
     void didReceiveResourceTiming(const ResourceTimingInfo&) override;
 
     Persistent<WorkerGlobalScope> m_workerGlobalScope;
     RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
     MainThreadBridgeBase* m_bridge;
 };
 
 } // namespace blink
 
 #endif // WorkerThreadableLoader_h