Add support for subresource request loads in AppCache for the network service.

content/browser/appcache/appcache_host.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_HOST_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_HOST_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "content/browser/appcache/appcache_group.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/browser/appcache/appcache_storage.h"
 #include "content/common/appcache_interfaces.h"
 #include "content/common/content_export.h"
 #include "content/public/common/resource_type.h"
 #include "url/gurl.h"
 
 namespace net {
@@ skipping 161 matching lines @@
     return pending_selected_cache_id_ != kAppCacheNoCacheId ||
            !pending_selected_manifest_url_.is_empty();
   }
 
   const GURL& first_party_url() const { return first_party_url_; }
 
   // Methods to support cross site navigations.
   void PrepareForTransfer();
   void CompleteTransfer(int host_id, AppCacheFrontend* frontend);
 
+  // Returns a weak pointer reference to the host.
+  base::WeakPtr<AppCacheHost> GetWeakPtr();
+
  private:
   friend class content::AppCacheHostTest;
   friend class content::AppCacheStorageImplTest;
   friend class content::AppCacheRequestHandlerTest;
   friend class content::AppCacheUpdateJobTest;
 
   AppCacheStatus GetStatus();
   void LoadSelectedCache(int64_t cache_id);
   void LoadOrCreateGroup(const GURL& manifest_url);
 
@@ skipping 139 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, ForeignEntry);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, FailedCacheLoad);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, FailedGroupLoad);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, SetSwappableCache);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, ForDedicatedWorker);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, SelectCacheAllowed);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, SelectCacheBlocked);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheHostTest, SelectCacheTwice);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheTest, CleanupUnusedCache);
 
+  // The WeakPtrFactory below must occur last in the class definition so they
+  // get destroyed last.

[kinuko, 2017/07/03 06:34:15]

nit: this comment felt a bit confusing to me (two 'last' in different context),
maybe just remove (we have clang warning for this right?) or 'they get destroyed
last' -> 'weak pointers are invalidated before other members'?

[ananta, 2017/07/03 07:36:47]

Removed this comment. I checked other places in the code. We have a number of
them which don't have a comment. 

+  base::WeakPtrFactory<AppCacheHost> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(AppCacheHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_HOST_H_