Revert 449036, which rolled back 402098, and fix the valgrind error that caused the original rollback:

Revert 33394 (due to valgrind errors) - Appcache update support for pending
master entries:
 Update process issues a URL request to fetch pending master entries.
 Pending master entry fetch logic kept separate from regular url fetching as
this will be the case in the longterm solution.
 No optimizations to avoid issuing URL request if pending master entry is also
listed in the manifest. (simpler)
 Only optimized to prevent refetching something that has already been
successfully fetched.

Longterm optimized solution should be to siphon the responses as the master
resource is downloaded instead of having the update job issue URL requests.


TEST=new tests for update jobs with pending master entries
BUG=none

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

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

1 files changed, 7 insertions, 0 deletions

diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index 0622e3f..f154bae 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/appcache/appcache_host.h
@@ -84,6 +84,12 @@ class AppCacheHost : public AppCacheStorage::Delegate,
   // Used to ensure that a loaded appcache survives a frame navigation.
   void LoadMainResourceCache(int64 cache_id);
 
+  // Used by the update job to keep track of which hosts are associated
+  // with which pending master entries.
+  const GURL& pending_master_entry_url() const {
+    return new_master_entry_url_;
+  }
+
   int host_id() const { return host_id_; }
   AppCacheService* service() const { return service_; }
   AppCacheFrontend* frontend() const { return frontend_; }
@@ -163,6 +169,7 @@ class AppCacheHost : public AppCacheStorage::Delegate,
   ObserverList<Observer> observers_;
 
   friend class AppCacheRequestHandlerTest;
+  friend class AppCacheUpdateJobTest;
   FRIEND_TEST(AppCacheTest, CleanupUnusedCache);
   FRIEND_TEST(AppCacheGroupTest, CleanupUnusedGroup);
   FRIEND_TEST(AppCacheHostTest, Basic);