Pages controlled by ServiceWorkers should not participate in AppCaching

content/browser/storage_partition_impl_map.cc

 // Copyright (c) 2012 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 "content/browser/storage_partition_impl_map.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/service_worker/service_worker_request_handler.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/browser/streams/stream_registry.h"
@@ skipping 402 matching lines @@
                 blob_storage_context));
   }
   protocol_handlers[kChromeDevToolsScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateDevToolsProtocolHandler(browser_context_->GetResourceContext(),
                                         browser_context_->IsOffTheRecord()));
 
   URLRequestInterceptorScopedVector request_interceptors;
   request_interceptors.push_back(
       ServiceWorkerRequestHandler::CreateInterceptor().release());
+  request_interceptors.push_back(
+      AppCacheInterceptor::CreateStartInterceptor().release());

[michaeln, 2014/10/10 21:55:40]

here's how we get the ordering we want

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

It took me a while to see how this works. Before this CL, AppCache was called
before SW, so just adding the interceptor here (and not removing something
elsewhere) wouldn't seem to fix it. Now I see... the original
AppCacheInterceptor::MaybeIntercept is still called first but now does nothing
and the StartInterceptor is the one that really chooses whether AppCache kicks
in?

[michaeln, 2014/10/14 01:52:42]

Thats right.

 
   // These calls must happen after StoragePartitionImpl::Create().
   if (partition_domain.empty()) {
     partition->SetURLRequestContext(
         GetContentClient()->browser()->CreateRequestContext(
             browser_context_,
             &protocol_handlers,
             request_interceptors.Pass()));
   } else {
     partition->SetURLRequestContext(
@@ skipping 140 matching lines @@
 
     // We do not call InitializeURLRequestContext() for media contexts because,
     // other than the HTTP cache, the media contexts share the same backing
     // objects as their associated "normal" request context.  Thus, the previous
     // call serves to initialize the media request context for this storage
     // partition as well.
   }
 }
 
 }  // namespace content