Make prepareRequest() a separate callback of FetchContext

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

 /*
  * Copyright (C) 2013 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 63 matching lines @@
 
   void addAdditionalRequestHeaders(ResourceRequest&,
                                    FetchResourceType) override;
   WebCachePolicy resourceRequestCachePolicy(
       ResourceRequest&,
       Resource::Type,
       FetchRequest::DeferOption) const override;
   void dispatchDidChangeResourcePriority(unsigned long identifier,
                                          ResourceLoadPriority,
                                          int intraPriorityValue) override;
+  void prepareRequest(ResourceRequest&, RedirectType) override;
   void dispatchWillSendRequest(
       unsigned long identifier,
       ResourceRequest&,
       const ResourceResponse& redirectResponse,
       const FetchInitiatorInfo& = FetchInitiatorInfo()) override;
   void dispatchDidLoadResourceFromMemoryCache(
       unsigned long identifier,
       Resource*,
       WebURLRequest::FrameType,
       WebURLRequest::RequestContext) override;
@@ skipping 13 matching lines @@
   void dispatchDidFinishLoading(unsigned long identifier,
                                 double finishTime,
                                 int64_t encodedDataLength,
                                 int64_t decodedBodyLength) override;
   void dispatchDidFail(unsigned long identifier,
                        const ResourceError&,
                        int64_t encodedDataLength,
                        bool isInternalRequest) override;
 
   bool shouldLoadNewResource(Resource::Type) const override;
-  void willStartLoadingResource(unsigned long identifier,
-                                ResourceRequest&,
-                                Resource::Type,
-                                const AtomicString& fetchInitiatorName,
-                                V8ActivityLoggingPolicy) override;
+  void recordLoadingActivity(unsigned long identifier,
+                             const ResourceRequest&,
+                             Resource::Type,
+                             const AtomicString& fetchInitiatorName) override;
   void didLoadResource(Resource*) override;
 
   void addResourceTiming(const ResourceTimingInfo&) override;
   bool allowImage(bool imagesEnabled, const KURL&) const override;
   ResourceRequestBlockedReason canRequest(
       Resource::Type,
       const ResourceRequest&,
       const KURL&,
       const ResourceLoaderOptions&,
       SecurityViolationReportingPolicy,
@@ skipping 55 matching lines @@
   void printAccessDeniedMessage(const KURL&) const;
   ResourceRequestBlockedReason canRequestInternal(
       Resource::Type,
       const ResourceRequest&,
       const KURL&,
       const ResourceLoaderOptions&,
       SecurityViolationReportingPolicy,
       FetchRequest::OriginRestriction,
       ResourceRequest::RedirectStatus) const;
 
-  void prepareRequest(ResourceRequest&);
-
   void dispatchDidReceiveResponseInternal(unsigned long identifier,
                                           const ResourceResponse&,
                                           WebURLRequest::FrameType,
                                           WebURLRequest::RequestContext,
                                           Resource*,
                                           LinkLoader::CanLoadResources);
 
   void addCSPHeaderIfNecessary(Resource::Type, ResourceRequest&);
 
   // FIXME: Oilpan: Ideally this should just be a traced Member but that will
   // currently leak because ComputedStyle and its data are not on the heap.
   // See crbug.com/383860 for details.
   WeakMember<Document> m_document;
   Member<DocumentLoader> m_documentLoader;
 };
 
 }  // namespace blink
 
 #endif