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

webkit/appcache/appcache_request_handler.h

 // Copyright (c) 2010 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 WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 #define WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 
 #include "net/url_request/url_request.h"
 #include "webkit/appcache/appcache_entry.h"
 #include "webkit/appcache/appcache_host.h"
@@ skipping 35 matching lines @@
 
   // Callers should use AppCacheHost::CreateRequestHandler.
   AppCacheRequestHandler(AppCacheHost* host, ResourceType::Type resource_type);
 
   // AppCacheHost::Observer override
   virtual void OnDestructionImminent(AppCacheHost* host);
 
   // 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();
 
   // Helper to retrieve a pointer to the storage object.
   AppCacheStorage* storage() const;
 
   bool is_main_resource() const {
     return IsMainResourceType(resource_type_);
   }
 
   // Main-resource loading -------------------------------------
   // Frame and SharedWorker main resources are handled here.
 
   void MaybeLoadMainResource(URLRequest* request);
 
   // 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);
 
   // Sub-resource loading -------------------------------------
   // Dedicated worker and all manner of sub-resources are handled here.
 
   void MaybeLoadSubResource(URLRequest* request);
   void ContinueMaybeLoadSubResource();
 
   // AppCacheHost::Observer override
   virtual void OnCacheSelectionComplete(AppCacheHost* host);
 
   // Data members -----------------------------------------------
 
   // What host we're servicing a request for.
   AppCacheHost* host_;
 
   // Frame vs subresource vs sharedworker loads are somewhat different.
   ResourceType::Type resource_type_;
 
   // Subresource requests wait until after cache selection completes.
   bool is_waiting_for_cache_selection_;
 
   // 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_;
 
   // True if a cache entry this handler attempted to return was
   // not found in the disk cache. Once set, the handler will take
   // no action on all subsequent intercept opportunities, so the
   // request and any redirects will be handled by the network library.
   bool cache_entry_not_found_;
 
   // The job we use to deliver a response.
   scoped_refptr<AppCacheURLRequestJob> job_;
 
   friend class AppCacheRequestHandlerTest;
   DISALLOW_COPY_AND_ASSIGN(AppCacheRequestHandler);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_