Rename AppCache's Manifest to AppCacheManifest.

content/browser/appcache/appcache_manifest_parser_unittest.cc

 // Copyright 2014 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 <string>
 
 #include "content/browser/appcache/appcache_manifest_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class AppCacheManifestParserTest : public testing::Test {
 };
 
 TEST(AppCacheManifestParserTest, NoData) {
   GURL url;
-  Manifest manifest;
+  AppCacheManifest manifest;
   EXPECT_FALSE(ParseManifest(url, "", 0,
                              PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_FALSE(ParseManifest(url, "CACHE MANIFEST\r", 0,  // Len is 0.
                              PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
 }
 
 TEST(AppCacheManifestParserTest, CheckSignature) {
   GURL url;
-  Manifest manifest;
+  AppCacheManifest manifest;
 
   const std::string kBadSignatures[] = {
     "foo",
     "CACHE MANIFEST;V2\r",          // not followed by whitespace
     "CACHE MANIFEST#bad\r",         // no whitespace before comment
     "cache manifest ",              // wrong case
     "#CACHE MANIFEST\r",            // comment
     "xCACHE MANIFEST\n",            // bad first char
     " CACHE MANIFEST\r",            // begins with whitespace
     "\xEF\xBE\xBF" "CACHE MANIFEST\r",  // bad UTF-8 BOM value
@@ skipping 18 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(kGoodSignatures); ++i) {
     const std::string good = kGoodSignatures[i];
     EXPECT_TRUE(ParseManifest(url, good.c_str(), good.length(),
                               PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   }
 }
 
 TEST(AppCacheManifestParserTest, NoManifestUrl) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const std::string kData("CACHE MANIFEST\r"
     "relative/tobase.com\r"
     "http://absolute.com/addme.com");
   const GURL kUrl;
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 }
 
 TEST(AppCacheManifestParserTest, ExplicitUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "relative/one\r"
     "# some comment\r"
     "http://www.foo.com/two#strip\r\n"
     "NETWORK:\r"
     "  \t CACHE:\r"
     "HTTP://www.diff.com/three\r"
     "FALLBACK:\r"
     " \t # another comment with leading whitespace\n"
@@ skipping 16 matching lines @@
   ASSERT_EQ(kExpected, urls.size());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/one") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/two") != urls.end());
   EXPECT_TRUE(urls.find("http://www.diff.com/three") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/four") != urls.end());
 
   // Wildcard is treated as a relative URL in explicit section.
   EXPECT_TRUE(urls.find("http://www.foo.com/*") != urls.end());
 
   // We should get the same results with intercepts disallowed.
-  manifest = Manifest();
+  manifest = AppCacheManifest();
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_PER_STANDARD, manifest));
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
   urls = manifest.explicit_urls;
   ASSERT_EQ(kExpected, urls.size());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/one") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/two") != urls.end());
   EXPECT_TRUE(urls.find("http://www.diff.com/three") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/four") != urls.end());
 
   // Wildcard is treated as a relative URL in explicit section.
   EXPECT_TRUE(urls.find("http://www.foo.com/*") != urls.end());
 }
 
 TEST(AppCacheManifestParserTest, WhitelistUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.bar.com");
   const std::string kData("CACHE MANIFEST\r"
     "NETWORK:\r"
     "relative/one\r"
     "# a comment\r"
     "http://www.bar.com/two\r"
     "HTTP://www.diff.com/three#strip\n\r"
     "FALLBACK:\r"
     "garbage\r"
     "UNKNOWN:\r"
@@ skipping 20 matching lines @@
   EXPECT_TRUE(online[0].target_url.is_empty());
   EXPECT_EQ(GURL("http://www.bar.com/relative/one"), online[0].namespace_url);
   EXPECT_EQ(GURL("http://www.bar.com/two"), online[1].namespace_url);
   EXPECT_EQ(GURL("http://www.diff.com/three"), online[2].namespace_url);
   EXPECT_EQ(GURL("http://www.bar.com/relative/four"), online[3].namespace_url);
   EXPECT_EQ(GURL("http://www.five.com"), online[4].namespace_url);
   EXPECT_EQ(GURL("http://www.bar.com/*foo"), online[5].namespace_url);
 }
 
 TEST(AppCacheManifestParserTest, FallbackUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://glorp.com");
   const std::string kData("CACHE MANIFEST\r"
     "# a comment\r"
     "CACHE:\r"
     "NETWORK:\r"
     "UNKNOWN:\r"
     "FALLBACK:\r"
     "relative/one \t \t http://glorp.com/onefb  \t \r"
     "*\r"
     "https://glorp.com/wrong http://glorp.com/wrongfb\r"
@@ skipping 43 matching lines @@
             fallbacks[3].target_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/four"),
             fallbacks[4].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/fourfb"),
             fallbacks[4].target_url);
 
   EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
 TEST(AppCacheManifestParserTest, FallbackUrlsWithPort) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.portme.com:1234");
   const std::string kData("CACHE MANIFEST\r"
     "FALLBACK:\r"
     "http://www.portme.com:1234/one relative/onefb\r"
     "HTTP://www.portme.com:9876/wrong http://www.portme.com:1234/ignore\r"
     "http://www.portme.com:1234/stillwrong http://www.portme.com:42/boo\r"
     "relative/two relative/twofb\r"
     "http://www.portme.com:1234/three HTTP://www.portme.com:1234/threefb\r"
     "http://www.portme.com/noport http://www.portme.com:1234/skipped\r"
     "http://www.portme.com:1234/skipme http://www.portme.com/noport\r");
@@ skipping 20 matching lines @@
             fallbacks[1].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/three"),
             fallbacks[2].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/threefb"),
             fallbacks[2].target_url);
 
   EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
 TEST(AppCacheManifestParserTest, InterceptUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.portme.com:1234");
   const std::string kData("CHROMIUM CACHE MANIFEST\r"
     "CHROMIUM-INTERCEPT:\r"
     "http://www.portme.com:1234/one return relative/int1\r"
     "HTTP://www.portme.com:9/wrong return http://www.portme.com:1234/ignore\r"
     "http://www.portme.com:1234/wrong return http://www.portme.com:9/boo\r"
     "relative/two return relative/int2\r"
     "relative/three wrong relative/threefb\r"
     "http://www.portme.com:1234/three return HTTP://www.portme.com:1234/int3\r"
     "http://www.portme.com/noport return http://www.portme.com:1234/skipped\r"
@@ skipping 20 matching lines @@
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/two"),
             intercepts[1].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/int2"),
             intercepts[1].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/three"),
             intercepts[2].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/int3"),
             intercepts[2].target_url);
 
   // Disallow intercepts ths time.
-  manifest = Manifest();
+  manifest = AppCacheManifest();
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_PER_STANDARD, manifest));
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_TRUE(manifest.intercept_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 }
 
 TEST(AppCacheManifestParserTest, ComboUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://combo.com:42");
   const std::string kData("CACHE MANIFEST\r"
     "relative/explicit-1\r"
     "# some comment\r"
     "http://combo.com:99/explicit-2#strip\r"
     "NETWORK:\r"
     "http://combo.com/whitelist-1\r"
     "HTTP://www.diff.com/whitelist-2#strip\r"
     "*\r"
     "CACHE:\n\r"
@@ skipping 42 matching lines @@
             fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/fallback-2"),
             fallbacks[1].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/fallback-2b"),
             fallbacks[1].target_url);
 
   EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
 TEST(AppCacheManifestParserTest, UnusualUtf8) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://bad.com");
   const std::string kData("CACHE MANIFEST\r"
     "\xC0" "invalidutf8\r"
     "nonbmp" "\xF1\x84\xAB\xBC\r");
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   base::hash_set<std::string> urls = manifest.explicit_urls;
   EXPECT_TRUE(urls.find("http://bad.com/%EF%BF%BDinvalidutf8") != urls.end());
   EXPECT_TRUE(urls.find("http://bad.com/nonbmp%F1%84%AB%BC") != urls.end());
 }
 
 TEST(AppCacheManifestParserTest, IgnoreAfterSpace) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://smorg.borg");
   const std::string kData(
     "CACHE MANIFEST\r"
     "resource.txt this stuff after the white space should be ignored\r");
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
 
   base::hash_set<std::string> urls = manifest.explicit_urls;
   EXPECT_TRUE(urls.find("http://smorg.borg/resource.txt") != urls.end());
 }
 
 TEST(AppCacheManifestParserTest, DifferentOriginUrlWithSecureScheme) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("https://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "CACHE: \r"
     "relative/secureschemesameorigin\r"
     "https://www.foo.com/secureschemesameorigin\r"
     "http://www.xyz.com/secureschemedifforigin\r"
     "https://www.xyz.com/secureschemedifforigin\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
@@ skipping 25 matching lines @@
       "http://foo.com/*/intercept_pattern?query return /pattern isPattern\r"
       "FALLBACK:\r"
       "http://foo.com/fallback_prefix  /prefix wrongAnnotation\r"
       "http://foo.com/fallback_pattern* /pattern\tisPattern    \r"
       "NETWORK:\r"
       "*\r"
       "isPattern\r"  // should not be interpretted as a pattern
       "http://foo.com/network_pattern* isPattern\r");
 
 
-  Manifest manifest;
+  AppCacheManifest manifest;
   EXPECT_TRUE(ParseManifest(kUrl, kManifestBody.c_str(),
                             kManifestBody.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_TRUE(manifest.online_whitelist_all);
   EXPECT_EQ(1u, manifest.explicit_urls.size());
   EXPECT_EQ(3u, manifest.intercept_namespaces.size());
   EXPECT_EQ(2u, manifest.fallback_namespaces.size());
   EXPECT_EQ(2u, manifest.online_whitelist_namespaces.size());
   EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE,
             manifest.intercept_namespaces[0].type);
@@ skipping 27 matching lines @@
       manifest.online_whitelist_namespaces[0].target_url);
   EXPECT_EQ(
       GURL("http://foo.com/network_pattern*"),
       manifest.online_whitelist_namespaces[1].namespace_url);
   EXPECT_EQ(
       GURL(),
       manifest.online_whitelist_namespaces[1].target_url);
 }
 
 }  // namespace content