| Index: content/browser/appcache/appcache_unittest.cc
|
| diff --git a/content/browser/appcache/appcache_unittest.cc b/content/browser/appcache/appcache_unittest.cc
|
| index a82ab3df40a4e76e7555df1ece12ddab52ba43fb..8b9b086f9ff5d6f0192420f32ac229467f767edb 100644
|
| --- a/content/browser/appcache/appcache_unittest.cc
|
| +++ b/content/browser/appcache/appcache_unittest.cc
|
| @@ -108,7 +108,7 @@ TEST(AppCacheTest, InitializeWithManifest) {
|
| EXPECT_TRUE(cache->online_whitelist_namespaces_.empty());
|
| EXPECT_FALSE(cache->online_whitelist_all_);
|
|
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| manifest.explicit_urls.insert("http://one.com");
|
| manifest.explicit_urls.insert("http://two.com");
|
| manifest.fallback_namespaces.push_back(
|
| @@ -174,7 +174,7 @@ TEST(AppCacheTest, FindResponseForRequest) {
|
| const int64 kExplicitInOnlineNamespaceResponseId = 5;
|
| const int64 kInterceptResponseId = 6;
|
|
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| manifest.online_whitelist_namespaces.push_back(
|
| AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespaceUrl,
|
| GURL(), false));
|
| @@ -365,7 +365,7 @@ TEST(AppCacheTest, FindInterceptPatternResponseForRequest) {
|
| kInterceptNamespaceBase.Resolve("*.hit*"));
|
| const GURL kInterceptNamespaceEntry("http://blah/intercept_resource");
|
| const int64 kInterceptResponseId = 1;
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| manifest.intercept_namespaces.push_back(
|
| AppCacheNamespace(APPCACHE_INTERCEPT_NAMESPACE,
|
| kInterceptPatternNamespace, kInterceptNamespaceEntry, true));
|
| @@ -436,7 +436,7 @@ TEST(AppCacheTest, FindFallbackPatternResponseForRequest) {
|
| kFallbackNamespaceBase.Resolve("*.hit*"));
|
| const GURL kFallbackNamespaceEntry("http://blah/fallback_resource");
|
| const int64 kFallbackResponseId = 1;
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| manifest.fallback_namespaces.push_back(
|
| AppCacheNamespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackPatternNamespace,
|
| kFallbackNamespaceEntry, true));
|
| @@ -506,7 +506,7 @@ TEST(AppCacheTest, FindNetworkNamespacePatternResponseForRequest) {
|
| const GURL kNetworkNamespaceBase("http://blah/network_namespace/");
|
| const GURL kNetworkPatternNamespace(
|
| kNetworkNamespaceBase.Resolve("*.hit*"));
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| manifest.online_whitelist_namespaces.push_back(
|
| AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, kNetworkPatternNamespace,
|
| GURL(), true));
|
| @@ -562,7 +562,7 @@ TEST(AppCacheTest, ToFromDatabaseRecords) {
|
| scoped_refptr<AppCacheGroup> group =
|
| new AppCacheGroup(service.storage(), kManifestUrl, kGroupId);
|
| scoped_refptr<AppCache> cache(new AppCache(service.storage(), kCacheId));
|
| - Manifest manifest;
|
| + AppCacheManifest manifest;
|
| EXPECT_TRUE(ParseManifest(kManifestUrl, kData.c_str(), kData.length(),
|
| PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
|
| cache->InitializeWithManifest(&manifest);
|
|
|