Pages controlled by ServiceWorkers should not participate in AppCaching

content/browser/appcache/appcache_interceptor.h

Index: content/browser/appcache/appcache_interceptor.h
diff --git a/content/browser/appcache/appcache_interceptor.h b/content/browser/appcache/appcache_interceptor.h
index 1cb59f767a4589bc454265f0eef3322becca159f..6b4a78ecce40d001066e91504f2d3f59e41ddf77 100644
--- a/content/browser/appcache/appcache_interceptor.h
+++ b/content/browser/appcache/appcache_interceptor.h
@@ -9,6 +9,7 @@
 #include "content/common/content_export.h"
 #include "content/public/common/resource_type.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_interceptor.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -48,6 +49,14 @@ class CONTENT_EXPORT AppCacheInterceptor
 
   static AppCacheInterceptor* GetInstance();
 
+  // The appcache system employs two different interceptors. The singleton
+  // AppCacheInterceptor derives URLRequest::Interceptor and is used
+  // to hijack request handling upon receipt of the response or a redirect.
+  // A seperate URLRequestInterceptor derivative is used to hijack handling

[falken, 2014/10/14 01:24:49]

nittttty nit: separate

+  // at the very start of request processing. The seperate handler allows the

[falken, 2014/10/14 01:24:49]

separate

+  // content lib to order its collection of net::URLRequestInterceptors.
+  static scoped_ptr<net::URLRequestInterceptor> CreateStartInterceptor();
+
  protected:
   // Override from net::URLRequest::Interceptor:
   virtual net::URLRequestJob* MaybeIntercept(
@@ -63,6 +72,7 @@ class CONTENT_EXPORT AppCacheInterceptor
 
  private:
   friend struct DefaultSingletonTraits<AppCacheInterceptor>;
+  class StartInterceptor;
 
   AppCacheInterceptor();
   virtual ~AppCacheInterceptor();