diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 822469f51601..2bc9488136a8 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -179,11 +179,11 @@ ui/gfx/codec/png_codec.cc
 # Copyright The Chromium Authors and Apple Inc; BSD license. This third-party
 # code is taken from WebKit, the license for which we already pick up from
 # webkit/.
-content/browser/appcache/manifest_parser.cc
+content/browser/appcache/appcache_manifest_parser.cc
 # Copyright The Chromium Authors and Apple Inc; BSD license. This third-party
 # code is taken from WebKit, the license for which we already pick up from
 # webkit/.
-content/browser/appcache/manifest_parser.h
+content/browser/appcache/appcache_manifest_parser.h
 # Copyright The Chromium Authors and Netscape Communications Corporation; BSD
 # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
 # Mozilla, the license for which we already pick up from third_party/npapi/.
diff --git a/content/browser/appcache/appcache.h b/content/browser/appcache/appcache.h
index bab468c518c2..bc7344fed04f 100644
--- a/content/browser/appcache/appcache.h
+++ b/content/browser/appcache/appcache.h
@@ -14,7 +14,7 @@
 #include "base/time/time.h"
 #include "content/browser/appcache/appcache_database.h"
 #include "content/browser/appcache/appcache_entry.h"
-#include "content/browser/appcache/manifest_parser.h"
+#include "content/browser/appcache/appcache_manifest_parser.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
diff --git a/content/browser/appcache/manifest_parser.cc b/content/browser/appcache/appcache_manifest_parser.cc
similarity index 99%
rename from content/browser/appcache/manifest_parser.cc
rename to content/browser/appcache/appcache_manifest_parser.cc
index 2ca3ce85286e..cc6131cf076a 100644
--- a/content/browser/appcache/manifest_parser.cc
+++ b/content/browser/appcache/appcache_manifest_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "content/browser/appcache/manifest_parser.h"
+#include "content/browser/appcache/appcache_manifest_parser.h"
 
 #include "base/command_line.h"
 #include "base/i18n/icu_string_conversions.h"
diff --git a/content/browser/appcache/manifest_parser.h b/content/browser/appcache/appcache_manifest_parser.h
similarity index 90%
rename from content/browser/appcache/manifest_parser.h
rename to content/browser/appcache/appcache_manifest_parser.h
index 4deb5998ccd3..af3edac01c74 100644
--- a/content/browser/appcache/manifest_parser.h
+++ b/content/browser/appcache/appcache_manifest_parser.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 //
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
-#define CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_MANIFEST_PARSER_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_MANIFEST_PARSER_H_
 
 #include <string>
 #include <vector>
@@ -69,4 +69,4 @@ CONTENT_EXPORT bool ParseManifest(
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_MANIFEST_PARSER_H_
diff --git a/content/browser/appcache/manifest_parser_unittest.cc b/content/browser/appcache/appcache_manifest_parser_unittest.cc
similarity index 99%
rename from content/browser/appcache/manifest_parser_unittest.cc
rename to content/browser/appcache/appcache_manifest_parser_unittest.cc
index caefca3746ae..e6fce283dba0 100644
--- a/content/browser/appcache/manifest_parser_unittest.cc
+++ b/content/browser/appcache/appcache_manifest_parser_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "content/browser/appcache/manifest_parser.h"
+#include "content/browser/appcache/appcache_manifest_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index fa30a207f93c..d5782df20535 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -367,8 +367,8 @@
       'browser/appcache/appcache_working_set.h',
       'browser/appcache/chrome_appcache_service.cc',
       'browser/appcache/chrome_appcache_service.h',
-      'browser/appcache/manifest_parser.cc',
-      'browser/appcache/manifest_parser.h',
+      'browser/appcache/appcache_manifest_parser.cc',
+      'browser/appcache/appcache_manifest_parser.h',
       'browser/appcache/view_appcache_internals_job.cc',
       'browser/appcache/view_appcache_internals_job.h',
       'browser/battery_status/battery_status_manager_android.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e1d16925b96a..9f85ca5cd2fc 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -383,6 +383,7 @@
         'browser/appcache/appcache_disk_cache_unittest.cc',
         'browser/appcache/appcache_group_unittest.cc',
         'browser/appcache/appcache_host_unittest.cc',
+        'browser/appcache/appcache_manifest_parser_unittest.cc',
         'browser/appcache/appcache_quota_client_unittest.cc',
         'browser/appcache/appcache_request_handler_unittest.cc',
         'browser/appcache/appcache_response_unittest.cc',
@@ -393,7 +394,6 @@
         'browser/appcache/appcache_update_job_unittest.cc',
         'browser/appcache/appcache_url_request_job_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
-        'browser/appcache/manifest_parser_unittest.cc',
         'browser/appcache/mock_appcache_policy.cc',
         'browser/appcache/mock_appcache_policy.h',
         'browser/appcache/mock_appcache_service.cc',