Fix some loose ends around recently introduced AppCache INTERCEPT namespaces

webkit/appcache/appcache_host.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_HOST_H_
 #define WEBKIT_APPCACHE_APPCACHE_HOST_H_
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 105 matching lines @@
   // (see AppCacheUpdateJob).
   void AssociateCompleteCache(AppCache* cache);
 
   // Adds a reference to the newest complete cache in a group, unless it's the
   // same as the cache that is currently associated with the host.
   void SetSwappableCache(AppCacheGroup* group);
 
   // Used to ensure that a loaded appcache survives a frame navigation.
   void LoadMainResourceCache(int64 cache_id);
 
-  // Used to notify the host that a fallback resource is being delivered as
+  // Used to notify the host that a namespace resource is being delivered as
   // the main resource of the page and to provide its url.
-  void NotifyMainResourceFallback(const GURL& fallback_url);
+  void NotifyMainResourceIsNamespaceEntry(const GURL& namespace_entry_url);
 
   // Used to notify the host that the main resource was blocked by a policy. To
   // work properly, this method needs to by invoked prior to cache selection.
   void NotifyMainResourceBlocked(const GURL& manifest_url);
 
   // 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_;
   }
@@ skipping 99 matching lines @@
 
   // Since these are synchronous scriptable API calls in the client, there can
   // only be one type of callback pending. Also, we have to wait until we have a
   // cache selection prior to responding to these calls, as cache selection
   // involves async loading of a cache or a group from storage.
   GetStatusCallback pending_get_status_callback_;
   StartUpdateCallback pending_start_update_callback_;
   SwapCacheCallback pending_swap_cache_callback_;
   void* pending_callback_param_;
 
-  // True if a fallback resource was delivered as the main resource.
-  bool main_resource_was_fallback_;
-  GURL fallback_url_;
+  // True if an intercept or fallback namespace resource was
+  // delivered as the main resource.
+  bool main_resource_was_namespace_entry_;
+  GURL namespace_entry_url_;
 
   // True if requests for this host were blocked by a policy.
   bool main_resource_blocked_;
   GURL blocked_manifest_url_;
 
   // Tells if info about associated cache is pending. Info is pending
   // when update job has not returned success yet.
   bool associated_cache_info_pending_;
 
   // List of objects observing us.
@@ skipping 19 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, SelectCacheAllowed);
   FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, SelectCacheBlocked);
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheHost);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_HOST_H_