| Index: content/browser/appcache/manifest_parser.cc
 | 
| diff --git a/webkit/browser/appcache/manifest_parser.cc b/content/browser/appcache/manifest_parser.cc
 | 
| similarity index 97%
 | 
| rename from webkit/browser/appcache/manifest_parser.cc
 | 
| rename to content/browser/appcache/manifest_parser.cc
 | 
| index f43d8890312f6991a9f7b571fc63531386a99ebe..fb63f22b173fe91ddfddfc582c64796f02ab4b3f 100644
 | 
| --- a/webkit/browser/appcache/manifest_parser.cc
 | 
| +++ b/content/browser/appcache/manifest_parser.cc
 | 
| @@ -29,7 +29,7 @@
 | 
|   * 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"
 | 
| @@ -37,7 +37,7 @@
 | 
|  #include "base/strings/utf_string_conversions.h"
 | 
|  #include "url/gurl.h"
 | 
|  
 | 
| -namespace appcache {
 | 
| +namespace content {
 | 
|  
 | 
|  namespace {
 | 
|  
 | 
| @@ -219,7 +219,8 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
 | 
|        } 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) {
 | 
| @@ -304,7 +305,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
 | 
|  
 | 
|        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();
 | 
| @@ -368,7 +369,7 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
 | 
|        // 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();
 | 
| @@ -378,4 +379,4 @@ bool ParseManifest(const GURL& manifest_url, const char* data, int length,
 | 
|    return true;
 | 
|  }
 | 
|  
 | 
| -}  // namespace appcache
 | 
| +}  // namespace content
 | 
| 
 |