Fix some loose ends around recently introduced AppCache INTERCEPT namespaces

webkit/appcache/appcache_request_handler.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 WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 #define WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "net/url_request/url_request.h"
 #include "webkit/appcache/appcache_entry.h"
@@ skipping 41 matching lines @@
   // Callers should use AppCacheHost::CreateRequestHandler.
   AppCacheRequestHandler(AppCacheHost* host, ResourceType::Type resource_type);
 
   // AppCacheHost::Observer override
   virtual void OnDestructionImminent(AppCacheHost* host) OVERRIDE;
 
   // 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,
                                 int64 group_id, const GURL& manifest_url,
-                                bool is_fallback, const GURL& fallback_url);
+                                bool is_fallback,
+                                const GURL& namespace_entry_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_);
   }
 
@@ skipping 27 matching lines @@
 
   // 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_group_id_;
   int64 found_cache_id_;
   AppCacheEntry found_entry_;
   AppCacheEntry found_fallback_entry_;
-  GURL found_fallback_url_;
+  GURL found_namespace_entry_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_