Fix http/tests/appcache/foreign-fallback.html

webkit/appcache/appcache_request_handler.h

Index: webkit/appcache/appcache_request_handler.h
===================================================================
--- webkit/appcache/appcache_request_handler.h	(revision 64524)
+++ webkit/appcache/appcache_request_handler.h	(working copy)
@@ -53,7 +53,8 @@
   // Helpers to instruct a waiting job with what response to
   // deliver for the request we're handling.
   void DeliverAppCachedResponse(const AppCacheEntry& entry, int64 cache_id,
-                                const GURL& manifest_url, bool is_fallback);
+                                const GURL& manifest_url, bool is_fallback,
+                                const GURL& fallback_url);

[kinuko, 2010/11/02 07:47:23]

nit: per recent addition to the coding style guide, it'd be nice to put each
argument on a separate line for function definitions (if you think changing the
format would fit in this cl)

http://www.chromium.org/developers/coding-style#Code_Formatting

[michaeln, 2010/11/02 20:25:36]

I'll see if this fits...

void DeliverAppCachedResponse(
    const AppCacheEntry& entry, int64 cache_id, const GURL& manifest_url,
    bool is_fallback, const GURL& fallback_url);

   void DeliverNetworkResponse();
   void DeliverErrorResponse();
 
@@ -72,7 +73,7 @@
   // AppCacheStorage::Delegate methods
   virtual void OnMainResponseFound(
       const GURL& url, const AppCacheEntry& entry,
-      const AppCacheEntry& fallback_entry,
+      const GURL& fallback_url, const AppCacheEntry& fallback_entry,
       int64 cache_id, const GURL& mainfest_url,
       bool was_blocked_by_policy);
 
@@ -98,9 +99,10 @@
 
   // Info about the type of response we found for delivery.
   // These are relevant for both main and subresource requests.
+  int64 found_cache_id_;
   AppCacheEntry found_entry_;
   AppCacheEntry found_fallback_entry_;
-  int64 found_cache_id_;
+  GURL found_fallback_url_;
   GURL found_manifest_url_;
   bool found_network_namespace_;