Move all remaining appcache-related code to content namespace

content/browser/appcache/manifest_parser.cc

 // Copyright (c) 2011 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.
 //
 // This is a port of ManifestParser.cc from WebKit/WebCore/loader/appcache.
 
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 11 matching lines @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "webkit/browser/appcache/manifest_parser.h"
+#include "content/browser/appcache/manifest_parser.h"
 
 #include "base/command_line.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "url/gurl.h"
 
-namespace appcache {
+namespace content {
 
 namespace {
 
 // Helper function used to identify 'isPattern' annotations.
 bool HasPatternMatchingAnnotation(const wchar_t* line_p,
                                   const wchar_t* line_end) {
   // Skip whitespace separating the resource url from the annotation.
   // Note: trailing whitespace has already been trimmed from the line.
   while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
     ++line_p;
@@ skipping 161 matching lines @@
       // Per the spec, EXPLICIT cross-origin HTTS resources should be
       // ignored here. We've opted for a milder constraint and allow
       // caching unless the resource has a "no-store" header. That
       // condition is enforced in AppCacheUpdateJob.
 
       if (mode == EXPLICIT) {
         manifest.explicit_urls.insert(url.spec());
       } else {
         bool is_pattern = HasPatternMatchingAnnotation(line_p, line_end);
         manifest.online_whitelist_namespaces.push_back(
-            Namespace(APPCACHE_NETWORK_NAMESPACE, url, GURL(), is_pattern));
+            AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, url, GURL(),
+                is_pattern));
       }
     } else if (mode == INTERCEPT) {
       if (parse_mode != PARSE_MANIFEST_ALLOWING_INTERCEPTS) {
         manifest.did_ignore_intercept_namespaces = true;
         continue;
       }
 
       // Lines of the form,
       // <urlnamespace> <intercept_type> <targeturl>
       const wchar_t* line_p = line.c_str();
@@ skipping 64 matching lines @@
       if (target_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         target_url = target_url.ReplaceComponents(replacements);
       }
       if (manifest_url.GetOrigin() != target_url.GetOrigin())
         continue;
 
       bool is_pattern = HasPatternMatchingAnnotation(line_p, line_end);
       manifest.intercept_namespaces.push_back(
-          Namespace(APPCACHE_INTERCEPT_NAMESPACE, namespace_url,
+          AppCacheNamespace(APPCACHE_INTERCEPT_NAMESPACE, namespace_url,
                     target_url, is_pattern, verb == EXECUTE));
     } else if (mode == FALLBACK) {
       const wchar_t* line_p = line.c_str();
       const wchar_t* line_end = line_p + line.length();
 
       // Look for whitespace separating the two URLs
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       if (line_p == line_end) {
@@ skipping 43 matching lines @@
       // as the manifest's URL.
       if (manifest_url.GetOrigin() != fallback_url.GetOrigin()) {
         continue;
       }
 
       bool is_pattern = HasPatternMatchingAnnotation(line_p, line_end);
 
       // Store regardless of duplicate namespace URL. Only first match
       // will ever be used.
       manifest.fallback_namespaces.push_back(
-          Namespace(APPCACHE_FALLBACK_NAMESPACE, namespace_url,
+          AppCacheNamespace(APPCACHE_FALLBACK_NAMESPACE, namespace_url,
                     fallback_url, is_pattern));
     } else {
       NOTREACHED();
     }
   }
 
   return true;
 }
 
-}  // namespace appcache
+}  // namespace content