[wrapper-tracing] Untangle non-trivial mixin ctors

third_party/WebKit/Source/modules/fetch/Request.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchUtils.h"
@@ skipping 364 matching lines @@
   // "If |init|'s body member is present, run these substeps:"
   if (init.body) {
     // Perform the following steps:
     // - "Let |stream| and |Content-Type| be the result of extracting
     //   |init|'s body member."
     // - "Set |temporaryBody| to |stream|.
     // - "If |Content-Type| is non-null and |r|'s request's header list
     //   contains no header named `Content-Type`, append
     //   `Content-Type`/|Content-Type| to |r|'s Headers object. Rethrow any
     //   exception."
-    temporaryBody = new BodyStreamBuffer(scriptState, std::move(init.body));
+    temporaryBody = BodyStreamBuffer::create(scriptState, std::move(init.body));
     if (!init.contentType.isEmpty() &&
         !r->getHeaders()->has(HTTPNames::Content_Type, exceptionState)) {
       r->getHeaders()->append(HTTPNames::Content_Type, init.contentType,
                               exceptionState);
     }
     if (exceptionState.hadException())
       return nullptr;
   }
 
   // "Set |r|'s request's body to |temporaryBody|.
   if (temporaryBody) {
     r->m_request->setBuffer(temporaryBody);
     r->refreshBody(scriptState);
   }
 
   // "Set |r|'s MIME type to the result of extracting a MIME type from |r|'s
   // request's header list."
   r->m_request->setMIMEType(r->m_request->headerList()->extractMIMEType());
 
   // "If |input| is a Request object and |input|'s request's body is
   // non-null, run these substeps:"
   if (inputRequest && inputRequest->bodyBuffer()) {
     // "Let |dummyStream| be an empty ReadableStream object."
     auto dummyStream =
-        new BodyStreamBuffer(scriptState, BytesConsumer::createClosed());
+        BodyStreamBuffer::create(scriptState, BytesConsumer::createClosed());
     // "Set |input|'s request's body to a new body whose stream is
     // |dummyStream|."
     inputRequest->m_request->setBuffer(dummyStream);
     inputRequest->refreshBody(scriptState);
     // "Let |reader| be the result of getting reader from |dummyStream|."
     // "Read all bytes from |dummyStream| with |reader|."
     inputRequest->bodyBuffer()->closeAndLockAndDisturb();
   }
 
   // "Return |r|."
@@ skipping 41 matching lines @@
   return createRequestWithRequestOrString(scriptState, input, String(),
                                           requestInit, exceptionState);
 }
 
 Request* Request::create(ScriptState* scriptState, FetchRequestData* request) {
   return new Request(scriptState, request);
 }
 
 Request* Request::create(ScriptState* scriptState,
                          const WebServiceWorkerRequest& webRequest) {
-  return new Request(scriptState, webRequest);
+  FetchRequestData* request = FetchRequestData::create(scriptState, webRequest);
+  return new Request(scriptState, request);
 }
 
 Request::Request(ScriptState* scriptState,
                  FetchRequestData* request,
                  Headers* headers)
     : Body(scriptState->getExecutionContext()),
       m_request(request),
       m_headers(headers) {
   refreshBody(scriptState);
 }
 
 Request::Request(ScriptState* scriptState, FetchRequestData* request)
     : Request(scriptState, request, Headers::create(request->headerList())) {
   m_headers->setGuard(Headers::RequestGuard);
 }
 
-Request::Request(ScriptState* scriptState,
-                 const WebServiceWorkerRequest& request)
-    : Request(scriptState, FetchRequestData::create(scriptState, request)) {}
-
 String Request::method() const {
   // "The method attribute's getter must return request's method."
   return m_request->method();
 }
 
 KURL Request::url() const {
   // The url attribute's getter must return request's url, serialized with the
   // exclude fragment flag set.
   if (!m_request->url().hasFragmentIdentifier())
     return m_request->url();
@@ skipping 233 matching lines @@
       V8HiddenValue::internalBodyBuffer(scriptState->isolate()), bodyBuffer);
 }
 
 DEFINE_TRACE(Request) {
   Body::trace(visitor);
   visitor->trace(m_request);
   visitor->trace(m_headers);
 }
 
 }  // namespace blink