Move hacks for Inspector in restoreCachedResourceIfNeeded() to ResourceFetcher

third_party/WebKit/Source/core/fetch/ResourceFetcher.h

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.h
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
index 10991d53bc1c1f9a5faf09c75fcd50f4e2971b0d..8b8c4e88cc6ef9d8dcaab83acf196069e8da51c3 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.h
@@ -146,11 +146,6 @@ class CORE_EXPORT ResourceFetcher
     ResourceLoadingFromNetwork,
     ResourceLoadingFromCache
   };
-  void requestLoadStarted(unsigned long identifier,
-                          Resource*,
-                          const FetchRequest&,
-                          ResourceLoadStartType,
-                          bool isStaticData = false);
   static const ResourceLoaderOptions& defaultResourceOptions();
 
   String getCacheIdentifier() const;
@@ -167,6 +162,13 @@ class CORE_EXPORT ResourceFetcher
   // This is only exposed for testing purposes.
   HeapListHashSet<Member<Resource>>* preloads() { return m_preloads.get(); }
 
+  // Workaround for https://crbug.com/666214.
+  // TODO(hiroshige): Remove this hack.
+  void emulateLoadStartedForInspector(Resource*,
+                                      const KURL&,
+                                      WebURLRequest::RequestContext,
+                                      const AtomicString& initiatorName);
+
  private:
   friend class ResourceCacheValidationSuppressor;
 
@@ -207,6 +209,12 @@ class CORE_EXPORT ResourceFetcher
                        const ResourceLoaderOptions&);
   bool canAccessResponse(Resource*, const ResourceResponse&) const;
 
+  void requestLoadStarted(unsigned long identifier,
+                          Resource*,
+                          const FetchRequest&,
+                          ResourceLoadStartType,
+                          bool isStaticData = false);
+
   bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);
   bool shouldDeferImageLoad(const KURL&) const;