Fix for WKBug 47000: a failure mode given bad content (in an unlikely form). The error occurs when an html page is put in an appcache as a fallback resource (so it's listed in a fallback section), but it contains a manifest attribute that refers to a different manifest file. The system should mark the resource as foreign and exclude it from main resource loads, but it was failing to do so. The fix is to do that.

BUG=WK47000
TEST=http/tests/appcache/foreign-fallback.html


Review URL: http://codereview.chromium.org/3529009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64868 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 0 deletions

diff --git a/webkit/appcache/mock_appcache_storage.h b/webkit/appcache/mock_appcache_storage.h
index ad6ad65..70880aa 100644
--- a/webkit/appcache/mock_appcache_storage.h
+++ b/webkit/appcache/mock_appcache_storage.h
@@ -119,11 +119,13 @@ class MockAppCacheStorage : public AppCacheStorage {
   // unaffected.
   void SimulateFindMainResource(
       const AppCacheEntry& entry,
+      const GURL& fallback_url,
       const AppCacheEntry& fallback_entry,
       int64 cache_id, const GURL& manifest_url) {
     simulate_find_main_resource_ = true;
     simulate_find_sub_resource_ = false;
     simulated_found_entry_ = entry;
+    simulated_found_fallback_url_ = fallback_url;
     simulated_found_fallback_entry_ = fallback_entry;
     simulated_found_cache_id_ = cache_id;
     simulated_found_manifest_url_ = manifest_url,
@@ -157,6 +159,7 @@ class MockAppCacheStorage : public AppCacheStorage {
   AppCacheEntry simulated_found_entry_;
   AppCacheEntry simulated_found_fallback_entry_;
   int64 simulated_found_cache_id_;
+  GURL simulated_found_fallback_url_;
   GURL simulated_found_manifest_url_;
   bool simulated_found_network_namespace_;