ServiceWorker: Fix matching registration info missing during shift-reload.

content/browser/service_worker/service_worker_request_handler.cc

Index: content/browser/service_worker/service_worker_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_request_handler.cc b/content/browser/service_worker/service_worker_request_handler.cc
index c70b3fd9b9e59e40c0f085b255cdc191dc1df0b0..35faad547888834f2a03573cd19191543d70496e 100644
--- a/content/browser/service_worker/service_worker_request_handler.cc
+++ b/content/browser/service_worker/service_worker_request_handler.cc
@@ -15,6 +15,7 @@
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/resource_context.h"
+#include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_interceptor.h"
@@ -80,6 +81,10 @@ void ServiceWorkerRequestHandler::InitializeHandler(
     if (ServiceWorkerUtils::IsMainResourceType(resource_type)) {
       provider_host->SetDocumentUrl(net::SimplifyUrlForRequest(request->url()));
       provider_host->SetTopmostFrameUrl(request->first_party_for_cookies());
+      // A page load with skip_service_worker should be triggered by
+      // shift-reload, so retain all live matching registrations.
+      DCHECK(request->load_flags() & net::LOAD_BYPASS_CACHE);

[michaeln, 2015/06/24 19:47:22]

I'm not sure the dcheck is really appropriate, seems like it could make sense to
skip a registered sw w/o busting the http cache? The dcheck implies that its not
ok for that to happen, but why?

[xiang, 2015/06/25 05:37:32]

The dcheck is on the assumption that when a main resource load happened with
skip sw, the load should be triggered by shift-reload. As shift-reload has
LOAD_BY_PASS_CACHE specified, we can double check it here.

I feel it's OK to remove this dcheck as long as AddMatchingRegistrations doesn't
make any bad side effect.

+      provider_host->CopyMatchingRegistrations();
     }
     return;
   }