AppCache INTERCEPT namespace.

webkit/appcache/appcache_unittest.cc

Index: webkit/appcache/appcache_unittest.cc
===================================================================
--- webkit/appcache/appcache_unittest.cc	(revision 112534)
+++ webkit/appcache/appcache_unittest.cc	(working copy)
@@ -88,18 +88,18 @@
   manifest.explicit_urls.insert("http://one.com");
   manifest.explicit_urls.insert("http://two.com");
   manifest.fallback_namespaces.push_back(
-      FallbackNamespace(GURL("http://fb1.com"), GURL("http://fbone.com")));
+      Namespace(FALLBACK_NAMESPACE, GURL("http://fb1.com"), GURL("http://fbone.com")));
   manifest.online_whitelist_namespaces.push_back(GURL("http://w1.com"));
   manifest.online_whitelist_namespaces.push_back(GURL("http://w2.com"));
   manifest.online_whitelist_all = true;
 
   cache->InitializeWithManifest(&manifest);
-  const std::vector<FallbackNamespace>& fallbacks =
+  const std::vector<Namespace>& fallbacks =
       cache->fallback_namespaces_;
   size_t expected = 1;
   EXPECT_EQ(expected, fallbacks.size());
-  EXPECT_EQ(GURL("http://fb1.com"), fallbacks[0].first);
-  EXPECT_EQ(GURL("http://fbone.com"), fallbacks[0].second);
+  EXPECT_EQ(GURL("http://fb1.com"), fallbacks[0].namespace_url);
+  EXPECT_EQ(GURL("http://fbone.com"), fallbacks[0].target_url);
   const std::vector<GURL>& whitelist = cache->online_whitelist_namespaces_;
   expected = 2;
   EXPECT_EQ(expected, whitelist.size());
@@ -143,9 +143,9 @@
   manifest.online_whitelist_namespaces.push_back(
       kOnlineNamespaceWithinFallback);
   manifest.fallback_namespaces.push_back(
-      FallbackNamespace(kFallbackNamespaceUrl1, kFallbackEntryUrl1));
+      Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl1, kFallbackEntryUrl1));
   manifest.fallback_namespaces.push_back(
-      FallbackNamespace(kFallbackNamespaceUrl2, kFallbackEntryUrl2));
+      Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl2, kFallbackEntryUrl2));
 
   // Create a cache with some namespaces and entries.
   scoped_refptr<AppCache> cache(new AppCache(&service, 1234));