Get main frame and subframe AppCache loads to work.

content/browser/loader/navigation_url_loader_network_service.cc

 // Copyright 2017 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/loader/navigation_url_loader_network_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
+#include "content/browser/appcache/appcache_url_loader_factory.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/loader/navigation_resource_handler.h"
 #include "content/browser/loader/navigation_resource_throttle.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/browser/loader/url_loader_request_handler.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/browser/service_worker/service_worker_navigation_handle_core.h"
@@ skipping 100 matching lines @@
               service_worker_navigation_handle_core, blob_storage_context,
               request_info->begin_params.skip_service_worker, resource_type,
               request_info->begin_params.request_context_type, frame_type,
               request_info->are_ancestors_secure,
               request_info->common_params.post_data, web_contents_getter);
       if (service_worker_handler)
         handlers_.push_back(std::move(service_worker_handler));
     }
 
     if (appcache_handle_core) {
-      // TODO: add appcache code here.
+      std::unique_ptr<URLLoaderRequestHandler> appcache_handler =
+          AppCacheURLLoaderFactory::CreateRequestHandler(

[michaeln, 2017/06/02 01:17:59]

I'd vote to maintain as much symmetry with S/W as practical. So I'd vote to
rename/refactor things to match:

AppCacheRequestHandler::InitializeForNavigationNetworkService()

[ananta, 2017/06/03 01:55:55]

Done.

+              appcache_handle_core, url_loader_factory_getter.get());
+      if (appcache_handler)
+        handlers_.push_back(std::move(appcache_handler));
     }
 
     DCHECK(!network_factory_);
     network_factory_ = url_loader_factory_getter->GetNetworkFactory()->get();
 
     Restart(std::move(url_loader_request), std::move(url_loader_client_ptr));
   }
 
   // This could be called multiple times.
   void Restart(mojom::URLLoaderRequest url_loader_request,
                mojom::URLLoaderClientPtr url_loader_client_ptr) {
     url_loader_request_ = std::move(url_loader_request);
     url_loader_client_ptr_ = std::move(url_loader_client_ptr);
     handler_index_ = 0;
     MaybeStartLoader(nullptr);
   }
 
   void MaybeStartLoader(mojom::URLLoaderFactory* factory) {
     DCHECK(url_loader_client_ptr_.is_bound());
 
     if (factory) {
       factory->CreateLoaderAndStart(
           std::move(url_loader_request_), 0 /* routing_id? */,
           0 /* request_id? */, mojom::kURLLoadOptionSendSSLInfo,
           *resource_request_, std::move(url_loader_client_ptr_));
       return;
     }
 
     if (handler_index_ < handlers_.size()) {
       handlers_[handler_index_++]->MaybeCreateLoaderFactory(

[michaeln, 2017/06/02 01:17:59]

This method is a whole lot like AppCacheRequestHandler::MaybeLoadResource(). I
like how this was composed for SW and I'd like to see a similar arrangment for
appcache. I think this derivation makes sense...

class CONTENT_EXPORT AppCacheRequestHandler
    : public base::SupportsUserData::Data,
      public AppCacheHost::Observer,
      public AppCacheServiceImpl::Observer,
      public AppCacheStorage::Delegate,
      public URLLoaderRequestHandler {  <<<< here

So MaybeCreateLoaderFactory() method is a peer of MaybeLoadResource() just like
in SW'land

class CONTENT_EXPORT ServiceWorkerRequestHandler
    : public base::SupportsUserData::Data,
      public URLLoaderRequestHandler {

[ananta, 2017/06/03 01:55:55]

Thanks done. It made the code a lot simpler.

           *resource_request_, resource_context_,
           base::BindOnce(&URLLoaderRequestController::MaybeStartLoader,
                          base::Unretained(this)));
       return;
     }
 
     DCHECK_EQ(handlers_.size(), handler_index_);
     DCHECK(network_factory_ != nullptr);
     MaybeStartLoader(network_factory_);
   }
@@ skipping 177 matching lines @@
     TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted",
                            this, "&NavigationURLLoaderNetworkService", this,
                            "success", false);
 
     delegate_->OnRequestFailed(completion_status.exists_in_cache,
                                completion_status.error_code);
   }
 }
 
 }  // namespace content