Revert of Move ThreadableLoader to Oilpan heap (2/3)

third_party/WebKit/Source/core/loader/ThreadableLoader.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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ThreadableLoader_h
 #define ThreadableLoader_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/CrossThreadCopier.h"
-#include "platform/heap/Handle.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 #include <memory>
 
 namespace blink {
 
 class ResourceRequest;
 class ExecutionContext;
 class ThreadableLoaderClient;
 
@@ skipping 72 matching lines @@
 // just able to run on threads other than the main thread).
 //
 // Arguments common to both loadResourceSynchronously() and create():
 //
 // - ThreadableLoaderOptions argument configures this ThreadableLoader's
 //   behavior.
 //
 // - ResourceLoaderOptions argument will be passed to the FetchRequest
 //   that this ThreadableLoader creates. It can be altered e.g. when
 //   redirect happens.
-class CORE_EXPORT ThreadableLoader : public GarbageCollectedFinalized<ThreadableLoader> {
+class CORE_EXPORT ThreadableLoader {
     WTF_MAKE_NONCOPYABLE(ThreadableLoader);
 public:
     // ThreadableLoaderClient methods may not destroy the ThreadableLoader
     // instance in them.
     static void loadResourceSynchronously(ExecutionContext&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
 
     // This method never returns nullptr.
     //
     // This method must always be followed by start() call.
     // ThreadableLoaderClient methods are never called before start() call.
@@ skipping 20 matching lines @@
     // ThreadableLoaderClient::didFail() is called with a ResourceError
     // with isCancellation() returning true, if any of didFinishLoading()
     // or didFail.*() methods have not been called yet. (didFail() may be
     // called with a ResourceError with isCancellation() returning true
     // also for cancellation happened inside the loader.)
     //
     // ThreadableLoaderClient methods:
     // - may call cancel()
     // - can destroy the ThreadableLoader instance in them (by clearing
     //   std::unique_ptr<ThreadableLoader>).
-    static ThreadableLoader* create(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+    static std::unique_ptr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
 
     // The methods on the ThreadableLoaderClient passed on create() call
     // may be called synchronous to start() call.
     virtual void start(const ResourceRequest&) = 0;
 
     // A ThreadableLoader may have a timeout specified. It is possible, in some cases, for
     // the timeout to be overridden after the request is sent (for example, XMLHttpRequests
     // may override their timeout setting after sending).
     //
     // Set a new timeout relative to the time the request started, in milliseconds.
     virtual void overrideTimeout(unsigned long timeoutMilliseconds) = 0;
 
     virtual void cancel() = 0;
 
     virtual ~ThreadableLoader() { }
 
-    DEFINE_INLINE_VIRTUAL_TRACE() {}
-
 protected:
     ThreadableLoader() { }
 };
 
 } // namespace blink
 
 #endif // ThreadableLoader_h