AppCache INTERCEPT namespace.

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 70 matching lines @@
 
   scoped_refptr<AppCache> cache(new AppCache(&service, 1234));
   EXPECT_TRUE(cache->fallback_namespaces_.empty());
   EXPECT_TRUE(cache->online_whitelist_namespaces_.empty());
   EXPECT_FALSE(cache->online_whitelist_all_);
 
   Manifest manifest;
   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());
   EXPECT_EQ(GURL("http://w1.com"), whitelist[0]);
   EXPECT_EQ(GURL("http://w2.com"), whitelist[1]);
   EXPECT_TRUE(cache->online_whitelist_all_);
 
   // Ensure collections in manifest were taken over by the cache rather than
   // copied.
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
@@ skipping 23 matching lines @@
   const int64 kFallbackResponseId2 = 2;
   const int64 kManifestResponseId = 3;
   const int64 kForeignExplicitResponseId = 4;
   const int64 kExplicitInOnlineNamespaceResponseId = 5;
 
   Manifest manifest;
   manifest.online_whitelist_namespaces.push_back(kOnlineNamespaceUrl);
   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));
   cache->InitializeWithManifest(&manifest);
   cache->AddEntry(
       kFallbackEntryUrl1,
       AppCacheEntry(AppCacheEntry::FALLBACK, kFallbackResponseId1));
   cache->AddEntry(
       kFallbackEntryUrl2,
       AppCacheEntry(AppCacheEntry::FALLBACK, kFallbackResponseId2));
@@ skipping 93 matching lines @@
       kOnlineNamespaceWithinFallback.Resolve("online_resource"),
       &entry, &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);
 }
 
 }  // namespace appacache