Move all remaining appcache-related code to content namespace

content/browser/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/manifest_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
-#include "webkit/browser/appcache/manifest_parser.h"
-
-using appcache::Manifest;
-using appcache::NamespaceVector;
-using appcache::APPCACHE_FALLBACK_NAMESPACE;
-using appcache::APPCACHE_INTERCEPT_NAMESPACE;
-using appcache::APPCACHE_NETWORK_NAMESPACE;
-using appcache::PARSE_MANIFEST_ALLOWING_INTERCEPTS;
-using appcache::PARSE_MANIFEST_PER_STANDARD;
 
 namespace content {
 
 class AppCacheManifestParserTest : public testing::Test {
 };
 
 TEST(AppCacheManifestParserTest, NoData) {
   GURL url;
   Manifest manifest;
   EXPECT_FALSE(ParseManifest(url, "", 0,
@@ skipping 132 matching lines @@
     "http://www.five.com\r\n"
     "*foo\r");
 
   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.intercept_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  const NamespaceVector& online = manifest.online_whitelist_namespaces;
+  const AppCacheNamespaceVector& online = manifest.online_whitelist_namespaces;
   const size_t kExpected = 6;
   ASSERT_EQ(kExpected, online.size());
   EXPECT_EQ(APPCACHE_NETWORK_NAMESPACE, online[0].type);
   EXPECT_FALSE(online[0].is_pattern);
   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);
@@ skipping 25 matching lines @@
     "FALLBACK:\n"
     "relative/four#strip relative/fourfb#strip\r"
     "http://www.glorp.com/notsame relative/skipped\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
+  const AppCacheNamespaceVector& fallbacks = manifest.fallback_namespaces;
   const size_t kExpected = 5;
   ASSERT_EQ(kExpected, fallbacks.size());
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[2].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[3].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[4].type);
   EXPECT_EQ(GURL("http://glorp.com/relative/one"),
             fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/onefb"),
@@ skipping 30 matching lines @@
     "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");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
+  const AppCacheNamespaceVector& fallbacks = manifest.fallback_namespaces;
   const size_t kExpected = 3;
   ASSERT_EQ(kExpected, fallbacks.size());
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[2].type);
   EXPECT_EQ(GURL("http://www.portme.com:1234/one"),
             fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/onefb"),
             fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/two"),
@@ skipping 23 matching lines @@
     "http://www.portme.com:1234/skipme return http://www.portme.com/noport\r"
     "relative/wrong/again missing/intercept_type\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(),
                             PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest));
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  const NamespaceVector& intercepts = manifest.intercept_namespaces;
+  const AppCacheNamespaceVector& intercepts = manifest.intercept_namespaces;
   const size_t kExpected = 3;
   ASSERT_EQ(kExpected, intercepts.size());
   EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[0].type);
   EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[1].type);
   EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[2].type);
   EXPECT_EQ(GURL("http://www.portme.com:1234/one"),
             intercepts[0].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/int1"),
             intercepts[0].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/two"),
@@ skipping 43 matching lines @@
   EXPECT_TRUE(manifest.online_whitelist_all);
 
   base::hash_set<std::string> urls = manifest.explicit_urls;
   size_t expected = 3;
   ASSERT_EQ(expected, urls.size());
   EXPECT_TRUE(urls.find("http://combo.com:42/relative/explicit-1") !=
               urls.end());
   EXPECT_TRUE(urls.find("http://combo.com:99/explicit-2") != urls.end());
   EXPECT_TRUE(urls.find("http://www.diff.com/explicit-3") != urls.end());
 
-  const NamespaceVector& online = manifest.online_whitelist_namespaces;
+  const AppCacheNamespaceVector& online = manifest.online_whitelist_namespaces;
   expected = 4;
   ASSERT_EQ(expected, online.size());
   EXPECT_EQ(GURL("http://combo.com/whitelist-1"),
                  online[0].namespace_url);
   EXPECT_EQ(GURL("http://www.diff.com/whitelist-2"),
                  online[1].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/whitelist-3"),
                  online[2].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:99/whitelist-4"),
                  online[3].namespace_url);
 
-  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
+  const AppCacheNamespaceVector& fallbacks = manifest.fallback_namespaces;
   expected = 2;
   ASSERT_EQ(expected, fallbacks.size());
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type);
   EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type);
   EXPECT_EQ(GURL("http://combo.com:42/fallback-1"),
             fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:42/fallback-1b"),
             fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/fallback-2"),
             fallbacks[1].namespace_url);
@@ skipping 117 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