Refactor determineRequestContext() to remove a mutableResourceRequest() call

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 190 matching lines @@
 }
 
 static void populateTimingInfo(ResourceTimingInfo* info, Resource* resource) {
   KURL initialURL = resource->response().redirectResponses().isEmpty()
                         ? resource->resourceRequest().url()
                         : resource->response().redirectResponses()[0].url();
   info->setInitialURL(initialURL);
   info->setFinalResponse(resource->response());
 }
 
-static WebURLRequest::RequestContext requestContextFromType(
-    bool isMainFrame,
-    Resource::Type type) {
+WebURLRequest::RequestContext ResourceFetcher::determineRequestContext(
+    Resource::Type type,
+    bool isMainFrame) {
   switch (type) {
     case Resource::MainResource:
       if (!isMainFrame)
         return WebURLRequest::RequestContextIframe;
       // FIXME: Change this to a context frame type (once we introduce them):
       // http://fetch.spec.whatwg.org/#concept-request-context-frame-type
       return WebURLRequest::RequestContextHyperlink;
     case Resource::XSLStyleSheet:
       DCHECK(RuntimeEnabledFeatures::xsltEnabled());
     case Resource::CSSStyleSheet:
@@ skipping 406 matching lines @@
 }
 
 void ResourceFetcher::resourceTimingReportTimerFired(TimerBase* timer) {
   DCHECK_EQ(timer, &m_resourceTimingReportTimer);
   Vector<std::unique_ptr<ResourceTimingInfo>> timingReports;
   timingReports.swap(m_scheduledResourceTimingReports);
   for (const auto& timingInfo : timingReports)
     context().addResourceTiming(*timingInfo);
 }
 
-void ResourceFetcher::determineRequestContext(ResourceRequest& request,
-                                              Resource::Type type,
-                                              bool isMainFrame) {
-  WebURLRequest::RequestContext requestContext =
-      requestContextFromType(isMainFrame, type);
-  request.setRequestContext(requestContext);
-}
-
-void ResourceFetcher::determineRequestContext(ResourceRequest& request,
-                                              Resource::Type type) {
-  determineRequestContext(request, type, context().isMainFrame());
+WebURLRequest::RequestContext ResourceFetcher::determineRequestContext(
+    Resource::Type type) const {
+  return determineRequestContext(type, context().isMainFrame());
 }
 
 void ResourceFetcher::initializeResourceRequest(
     ResourceRequest& request,
     Resource::Type type,
     FetchRequest::DeferOption defer) {
   if (request.getCachePolicy() == WebCachePolicy::UseProtocolCachePolicy) {
     request.setCachePolicy(
         context().resourceRequestCachePolicy(request, type, defer));
   }
   if (request.requestContext() == WebURLRequest::RequestContextUnspecified)
-    determineRequestContext(request, type);
+    request.setRequestContext(determineRequestContext(type));
   if (type == Resource::LinkPrefetch)
     request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch");
 
   context().addAdditionalRequestHeaders(
       request,
       (type == Resource::MainResource) ? FetchMainResource : FetchSubresource);
 }
 
 void ResourceFetcher::initializeRevalidation(
     ResourceRequest& revalidatingRequest,
@@ skipping 879 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink