Rename AppCache's Manifest to AppCacheManifest.

BUG=None

Review URL: https://codereview.chromium.org/548373002

Cr-Commit-Position: refs/heads/master@{#293857}

9 files changed, 35 insertions, 35 deletions

diff --git a/content/browser/appcache/appcache.cc b/content/browser/appcache/appcache.cc
index 743b694..aa0b224 100644
--- a/content/browser/appcache/appcache.cc
+++ b/content/browser/appcache/appcache.cc
@@ -133,7 +133,7 @@ bool SortNamespacesByLength(
 }
 }
 
-void AppCache::InitializeWithManifest(Manifest* manifest) {
+void AppCache::InitializeWithManifest(AppCacheManifest* manifest) {
   DCHECK(manifest);
   intercept_namespaces_.swap(manifest->intercept_namespaces);
   fallback_namespaces_.swap(manifest->fallback_namespaces);
diff --git a/content/browser/appcache/appcache.h b/content/browser/appcache/appcache.h
index bc7344f..a444579 100644
--- a/content/browser/appcache/appcache.h
+++ b/content/browser/appcache/appcache.h
@@ -111,7 +111,7 @@ class CONTENT_EXPORT AppCache
 
   // Initializes the cache with information in the manifest.
   // Do not use the manifest after this call.
-  void InitializeWithManifest(Manifest* manifest);
+  void InitializeWithManifest(AppCacheManifest* manifest);
 
   // Initializes the cache with the information in the database records.
   void InitializeWithDatabaseRecords(
diff --git a/content/browser/appcache/appcache_manifest_parser.cc b/content/browser/appcache/appcache_manifest_parser.cc
index cc6131c..99f5e87 100644
--- a/content/browser/appcache/appcache_manifest_parser.cc
+++ b/content/browser/appcache/appcache_manifest_parser.cc
@@ -70,15 +70,15 @@ enum InterceptVerb {
   UNKNOWN_VERB,
 };
 
-Manifest::Manifest()
+AppCacheManifest::AppCacheManifest()
     : online_whitelist_all(false),
       did_ignore_intercept_namespaces(false) {
 }
 
-Manifest::~Manifest() {}
+AppCacheManifest::~AppCacheManifest() {}
 
 bool ParseManifest(const GURL& manifest_url, const char* data, int length,
-                   ParseMode parse_mode, Manifest& manifest) {
+                   ParseMode parse_mode, AppCacheManifest& manifest) {
   // This is an implementation of the parsing algorithm specified in
   // the HTML5 offline web application docs:
   //   http://www.w3.org/TR/html5/offline.html
diff --git a/content/browser/appcache/appcache_manifest_parser.h b/content/browser/appcache/appcache_manifest_parser.h
index af3edac..19685f8 100644
--- a/content/browser/appcache/appcache_manifest_parser.h
+++ b/content/browser/appcache/appcache_manifest_parser.h
@@ -43,9 +43,9 @@ class GURL;
 
 namespace content {
 
-struct CONTENT_EXPORT Manifest {
-  Manifest();
-  ~Manifest();
+struct CONTENT_EXPORT AppCacheManifest {
+  AppCacheManifest();
+  ~AppCacheManifest();
 
   base::hash_set<std::string> explicit_urls;
   AppCacheNamespaceVector intercept_namespaces;
@@ -65,7 +65,7 @@ CONTENT_EXPORT bool ParseManifest(
     const char* data,
     int length,
     ParseMode parse_mode,
-    Manifest& manifest);
+    AppCacheManifest& manifest);
 
 }  // namespace content
 
diff --git a/content/browser/appcache/appcache_manifest_parser_unittest.cc b/content/browser/appcache/appcache_manifest_parser_unittest.cc
index e6fce28..6dd8c27 100644
--- a/content/browser/appcache/appcache_manifest_parser_unittest.cc
+++ b/content/browser/appcache/appcache_manifest_parser_unittest.cc
@@ -15,7 +15,7 @@ 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.
@@ -24,7 +24,7 @@ TEST(AppCacheManifestParserTest, NoData) {
 
 TEST(AppCacheManifestParserTest, CheckSignature) {
   GURL url;
-  Manifest manifest;
+  AppCacheManifest manifest;
 
   const std::string kBadSignatures[] = {
     "foo",
@@ -63,7 +63,7 @@ TEST(AppCacheManifestParserTest, CheckSignature) {
 }
 
 TEST(AppCacheManifestParserTest, NoManifestUrl) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const std::string kData("CACHE MANIFEST\r"
     "relative/tobase.com\r"
     "http://absolute.com/addme.com");
@@ -77,7 +77,7 @@ TEST(AppCacheManifestParserTest, NoManifestUrl) {
 }
 
 TEST(AppCacheManifestParserTest, ExplicitUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "relative/one\r"
@@ -114,7 +114,7 @@ TEST(AppCacheManifestParserTest, ExplicitUrls) {
   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());
@@ -133,7 +133,7 @@ TEST(AppCacheManifestParserTest, ExplicitUrls) {
 }
 
 TEST(AppCacheManifestParserTest, WhitelistUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.bar.com");
   const std::string kData("CACHE MANIFEST\r"
     "NETWORK:\r"
@@ -174,7 +174,7 @@ TEST(AppCacheManifestParserTest, WhitelistUrls) {
 }
 
 TEST(AppCacheManifestParserTest, FallbackUrls) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://glorp.com");
   const std::string kData("CACHE MANIFEST\r"
     "# a comment\r"
@@ -238,7 +238,7 @@ TEST(AppCacheManifestParserTest, FallbackUrls) {
 }
 
 TEST(AppCacheManifestParserTest, FallbackUrlsWithPort) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://www.portme.com:1234");
   const std::string kData("CACHE MANIFEST\r"
     "FALLBACK:\r"
@@ -279,7 +279,7 @@ TEST(AppCacheManifestParserTest, FallbackUrlsWithPort) {
 }
 
 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"
@@ -320,7 +320,7 @@ TEST(AppCacheManifestParserTest, InterceptUrls) {
             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());
@@ -331,7 +331,7 @@ TEST(AppCacheManifestParserTest, InterceptUrls) {
 }
 
 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"
@@ -394,7 +394,7 @@ TEST(AppCacheManifestParserTest, ComboUrls) {
 }
 
 TEST(AppCacheManifestParserTest, UnusualUtf8) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://bad.com");
   const std::string kData("CACHE MANIFEST\r"
     "\xC0" "invalidutf8\r"
@@ -407,7 +407,7 @@ TEST(AppCacheManifestParserTest, UnusualUtf8) {
 }
 
 TEST(AppCacheManifestParserTest, IgnoreAfterSpace) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("http://smorg.borg");
   const std::string kData(
     "CACHE MANIFEST\r"
@@ -420,7 +420,7 @@ TEST(AppCacheManifestParserTest, IgnoreAfterSpace) {
 }
 
 TEST(AppCacheManifestParserTest, DifferentOriginUrlWithSecureScheme) {
-  Manifest manifest;
+  AppCacheManifest manifest;
   const GURL kUrl("https://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "CACHE: \r"
@@ -466,7 +466,7 @@ TEST(AppCacheManifestParserTest, PatternMatching) {
       "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));
diff --git a/content/browser/appcache/appcache_unittest.cc b/content/browser/appcache/appcache_unittest.cc
index a82ab3d..8b9b086 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);
diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/appcache/appcache_update_job.cc
index 351bd80..2b8b3ec 100644
--- a/content/browser/appcache/appcache_update_job.cc
+++ b/content/browser/appcache/appcache_update_job.cc
@@ -579,7 +579,7 @@ void AppCacheUpdateJob::ContinueHandleManifestFetchCompleted(bool changed) {
     return;
   }
 
-  Manifest manifest;
+  AppCacheManifest manifest;
   if (!ParseManifest(manifest_url_, manifest_data_.data(),
                      manifest_data_.length(),
                      manifest_has_valid_mime_type_ ?
@@ -1094,7 +1094,7 @@ void AppCacheUpdateJob::OnManifestDataReadComplete(int result) {
   }
 }
 
-void AppCacheUpdateJob::BuildUrlFileList(const Manifest& manifest) {
+void AppCacheUpdateJob::BuildUrlFileList(const AppCacheManifest& manifest) {
   for (base::hash_set<std::string>::const_iterator it =
            manifest.explicit_urls.begin();
        it != manifest.explicit_urls.end(); ++it) {
diff --git a/content/browser/appcache/appcache_update_job.h b/content/browser/appcache/appcache_update_job.h
index 4da4ac2..68c1a8a 100644
--- a/content/browser/appcache/appcache_update_job.h
+++ b/content/browser/appcache/appcache_update_job.h
@@ -215,7 +215,7 @@ class CONTENT_EXPORT AppCacheUpdateJob
 
   // Creates the list of files that may need to be fetched and initiates
   // fetches. Section 6.9.4 steps 12-17
-  void BuildUrlFileList(const Manifest& manifest);
+  void BuildUrlFileList(const AppCacheManifest& manifest);
   void AddUrlToFileList(const GURL& url, int type);
   void FetchUrls();
   void CancelAllUrlFetches();
diff --git a/content/browser/appcache/mock_appcache_storage_unittest.cc b/content/browser/appcache/mock_appcache_storage_unittest.cc
index a945b27..e2093b4 100644
--- a/content/browser/appcache/mock_appcache_storage_unittest.cc
+++ b/content/browser/appcache/mock_appcache_storage_unittest.cc
@@ -469,7 +469,7 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainFallbackResponse) {
   const int64 kResponseId1 = 1;
   const int64 kResponseId2 = 2;
 
-  Manifest manifest;
+  AppCacheManifest manifest;
   manifest.fallback_namespaces.push_back(
       AppCacheNamespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackNamespaceUrl1,
                 kFallbackEntryUrl1, false));
@@ -581,7 +581,7 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) {
   const GURL kOnlineNamespaceUrl("http://blah/online_namespace");
   const int64 kResponseId = 1;
 
-  Manifest manifest;
+  AppCacheManifest manifest;
   manifest.online_whitelist_namespaces.push_back(
       AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespaceUrl,
                 GURL(), false));