Fix some loose ends around recently introduced AppCache INTERCEPT namespaces

webkit/appcache/appcache_unittest.cc

 // Copyright (c) 2009 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_frontend_impl.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/mock_appcache_service.h"
 
@@ skipping 173 matching lines @@
   cache->AddEntry(
       kInterceptNamespaceEntry,
       AppCacheEntry(AppCacheEntry::INTERCEPT, kInterceptResponseId));
   cache->set_complete(true);
 
   // See that we get expected results from FindResponseForRequest
 
   bool found = false;
   AppCacheEntry entry;
   AppCacheEntry fallback_entry;
+  GURL intercept_namespace;
   GURL fallback_namespace;
   bool network_namespace = false;
 
   found = cache->FindResponseForRequest(GURL("http://blah/miss"),
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_FALSE(found);
 
   found = cache->FindResponseForRequest(kForeignExplicitEntryUrl,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_EQ(kForeignExplicitResponseId, entry.response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_FALSE(network_namespace);
 
   entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kManifestUrl,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_EQ(kManifestResponseId, entry.response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_FALSE(network_namespace);
 
   entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kInOnlineNamespaceUrl,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_TRUE(network_namespace);
 
   network_namespace = false;  // reset
 
   found = cache->FindResponseForRequest(kExplicitInOnlineNamespaceUrl,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_EQ(kExplicitInOnlineNamespaceResponseId, entry.response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_FALSE(network_namespace);
 
   entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kFallbackTestUrl1,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_EQ(kFallbackResponseId1, fallback_entry.response_id());
   EXPECT_EQ(kFallbackEntryUrl1,
             cache->GetFallbackEntryUrl(fallback_namespace));
   EXPECT_FALSE(network_namespace);
 
   fallback_entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kFallbackTestUrl2,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_EQ(kFallbackResponseId2, fallback_entry.response_id());
   EXPECT_EQ(kFallbackEntryUrl2,
             cache->GetFallbackEntryUrl(fallback_namespace));
   EXPECT_FALSE(network_namespace);
 
   fallback_entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(kOnlineNamespaceWithinOtherNamespaces,
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_TRUE(network_namespace);
 
   fallback_entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(
       kOnlineNamespaceWithinOtherNamespaces.Resolve("online_resource"),
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_FALSE(entry.has_response_id());
   EXPECT_FALSE(fallback_entry.has_response_id());
   EXPECT_TRUE(network_namespace);
 
+  fallback_namespace = GURL();
+
   found = cache->FindResponseForRequest(
       kInterceptNamespace.Resolve("intercept_me"),
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_EQ(kInterceptResponseId, entry.response_id());
+  EXPECT_EQ(kInterceptNamespaceEntry,
+            cache->GetInterceptEntryUrl(intercept_namespace));
   EXPECT_FALSE(fallback_entry.has_response_id());
+  EXPECT_TRUE(fallback_namespace.is_empty());
   EXPECT_FALSE(network_namespace);
 
   entry = AppCacheEntry();  // reset
 
   found = cache->FindResponseForRequest(
       kInterceptNamespaceWithinFallback.Resolve("intercept_me"),
-      &entry, &fallback_entry, &fallback_namespace, &network_namespace);
+      &entry, &intercept_namespace,
+      &fallback_entry, &fallback_namespace,
+      &network_namespace);
   EXPECT_TRUE(found);
   EXPECT_EQ(kInterceptResponseId, entry.response_id());
+  EXPECT_EQ(kInterceptNamespaceEntry,
+            cache->GetInterceptEntryUrl(intercept_namespace));
   EXPECT_FALSE(fallback_entry.has_response_id());
+  EXPECT_TRUE(fallback_namespace.is_empty());
   EXPECT_FALSE(network_namespace);
 }
 
 }  // namespace appacache