Teach CrOS's OfflineResourceThrottle about ServiceWorkers so it know longer presents its offline in…

chrome/browser/renderer_host/offline_resource_throttle.cc

Index: chrome/browser/renderer_host/offline_resource_throttle.cc
diff --git a/chrome/browser/renderer_host/offline_resource_throttle.cc b/chrome/browser/renderer_host/offline_resource_throttle.cc
index 07230b879495db1d8778a66e4f9e8e8b9429e396..11b8c87f568a0573625b3014020b0acd76533e90 100644
--- a/chrome/browser/renderer_host/offline_resource_throttle.cc
+++ b/chrome/browser/renderer_host/offline_resource_throttle.cc
@@ -17,6 +17,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
+#include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ -61,7 +62,8 @@ OfflineResourceThrottle::OfflineResourceThrottle(
     net::URLRequest* request,
     content::AppCacheService* appcache_service)
     : request_(request),
-      appcache_service_(appcache_service) {
+      appcache_service_(appcache_service),
+      pending_callbacks_(0) {
   DCHECK(appcache_service);
 }
 
@@ -70,6 +72,8 @@ OfflineResourceThrottle::~OfflineResourceThrottle() {
 
   if (!appcache_completion_callback_.IsCancelled())
     appcache_completion_callback_.Cancel();
+  if (!service_worker_completion_callback_.IsCancelled())
+    service_worker_completion_callback_.Cancel();
 }
 
 void OfflineResourceThrottle::WillStartRequest(bool* defer) {
@@ -90,8 +94,9 @@ void OfflineResourceThrottle::WillStartRequest(bool* defer) {
     url = &redirect_url;
   }
 
-  DCHECK(appcache_completion_callback_.IsCancelled());
+  pending_callbacks_ = 1;
 
+  DCHECK(appcache_completion_callback_.IsCancelled());
   appcache_completion_callback_.Reset(
       base::Bind(&OfflineResourceThrottle::OnCanHandleOfflineComplete,
                  AsWeakPtr()));
@@ -99,6 +104,18 @@ void OfflineResourceThrottle::WillStartRequest(bool* defer) {
       *url, *first_party,
       appcache_completion_callback_.callback());
 
+  DCHECK(service_worker_completion_callback_.IsCancelled());
+  content::ServiceWorkerContext* service_worker_context =
+      content::ServiceWorkerContext::GetServiceWorkerContext(request_);
+  if (service_worker_context) {
+    pending_callbacks_ = 2;
+    service_worker_completion_callback_.Reset(
+        base::Bind(&OfflineResourceThrottle::OnCanHandleOfflineComplete,
+                   AsWeakPtr()));
+    service_worker_context->CanHandleMainResourceOffline(
+        *url, *first_party,
+        service_worker_completion_callback_.callback());
+  }
   *defer = true;
 }
 
@@ -129,11 +146,15 @@ bool OfflineResourceThrottle::ShouldShowOfflinePage(const GURL& url) const {
 }
 
 void OfflineResourceThrottle::OnCanHandleOfflineComplete(int rv) {
-  appcache_completion_callback_.Cancel();
+  --pending_callbacks_;
 
   if (rv == net::OK) {
+    appcache_completion_callback_.Cancel();
+    service_worker_completion_callback_.Cancel();
     controller()->Resume();
-  } else {
+  } else if (!pending_callbacks_) {
+    appcache_completion_callback_.Cancel();
+    service_worker_completion_callback_.Cancel();

[falken, 2014/12/16 08:16:49]

Would it improve readability to set pending_callbacks_ = 0 here and above, then
DCHECK(!pending_callbacks_) in WillStartRequest, and then use
++pending_callbacks_ there instead of setting to 1 and 2 directly? Just a
suggestion, WDYT.

[michaeln, 2015/01/09 01:47:36]

Done, kinda

     const content::ResourceRequestInfo* info =
         content::ResourceRequestInfo::ForRequest(request_);
     BrowserThread::PostTask(