Move webkit/appcache/* into webkit/{browser,common}/appcache

This moves following files to webkit/common/appcache
- appcache/appcache_interfaces*

Following files to webkit/renderer/appcache
- appcache/appcache_frontend_impl*
- appcache/web_application_cache_host_impl*

and everything else to webkit/browser/appcache.

BUG=239109
TBR=avi@chromium.org, michaeln@chromium.org, thestig@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204218 0039d316-1c4b-4281-b951-d872f2087c98

82 files changed, 442 insertions, 426 deletions

diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
deleted file mode 100644
index bc6a1ce..0000000
--- a/webkit/appcache/webkit_appcache.gypi
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.
-
-{
-  'variables': {
-    'webkit_appcache_sources': [
-      # This list contains all .h and .cc in appcache except for test code.
-      '../appcache/appcache.cc',
-      '../appcache/appcache.h',
-      '../appcache/appcache_backend_impl.cc',
-      '../appcache/appcache_backend_impl.h',
-      '../appcache/appcache_database.cc',
-      '../appcache/appcache_database.h',
-      '../appcache/appcache_disk_cache.cc',
-      '../appcache/appcache_disk_cache.h',
-      '../appcache/appcache_entry.h',
-      '../appcache/appcache_frontend_impl.cc',
-      '../appcache/appcache_frontend_impl.h',
-      '../appcache/appcache_group.cc',
-      '../appcache/appcache_group.h',
-      '../appcache/appcache_histograms.cc',
-      '../appcache/appcache_histograms.h',
-      '../appcache/appcache_host.cc',
-      '../appcache/appcache_host.h',
-      '../appcache/appcache_interceptor.cc',
-      '../appcache/appcache_interceptor.h',
-      '../appcache/appcache_interfaces.cc',
-      '../appcache/appcache_interfaces.h',
-      '../appcache/appcache_policy.h',
-      '../appcache/appcache_quota_client.cc',
-      '../appcache/appcache_quota_client.h',
-      '../appcache/appcache_request_handler.cc',
-      '../appcache/appcache_request_handler.h',
-      '../appcache/appcache_response.cc',
-      '../appcache/appcache_response.h',
-      '../appcache/appcache_service.cc',
-      '../appcache/appcache_service.h',
-      '../appcache/appcache_storage.cc',
-      '../appcache/appcache_storage.h',
-      '../appcache/appcache_storage_impl.cc',
-      '../appcache/appcache_storage_impl.h',
-      '../appcache/appcache_working_set.cc',
-      '../appcache/appcache_working_set.h',
-      '../appcache/appcache_update_job.cc',
-      '../appcache/appcache_update_job.h',
-      '../appcache/appcache_url_request_job.cc',
-      '../appcache/appcache_url_request_job.h',
-      '../appcache/manifest_parser.cc',
-      '../appcache/manifest_parser.h',
-      '../appcache/view_appcache_internals_job.h',
-      '../appcache/view_appcache_internals_job.cc',
-      '../appcache/web_application_cache_host_impl.cc',
-      '../appcache/web_application_cache_host_impl.h',
-      '../appcache/webkit_appcache.gypi',
-    ],
-  },
-}
diff --git a/webkit/appcache/DEPS b/webkit/browser/appcache/DEPS
index 8608d5f..8608d5f 100644
--- a/webkit/appcache/DEPS
+++ b/webkit/browser/appcache/DEPS
diff --git a/webkit/appcache/appcache.cc b/webkit/browser/appcache/appcache.cc
index 1d83a43..7d763de 100644
--- a/webkit/appcache/appcache.cc
+++ b/webkit/browser/appcache/appcache.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <algorithm>
+#include "webkit/browser/appcache/appcache.h"
 
-#include "webkit/appcache/appcache.h"
+#include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache.h b/webkit/browser/appcache/appcache.h
index f064873..556a789d 100644
--- a/webkit/appcache/appcache.h
+++ b/webkit/browser/appcache/appcache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_H_
-#define WEBKIT_APPCACHE_APPCACHE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
 
 #include <map>
 #include <set>
@@ -13,9 +13,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_database.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/manifest_parser.h"
+#include "webkit/browser/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/manifest_parser.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
@@ -181,4 +181,4 @@ class WEBKIT_STORAGE_EXPORT AppCache : public base::RefCounted<AppCache> {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
diff --git a/webkit/appcache/appcache_backend_impl.cc b/webkit/browser/appcache/appcache_backend_impl.cc
index 9b132f4..fd8029d 100644
--- a/webkit/appcache/appcache_backend_impl.cc
+++ b/webkit/browser/appcache/appcache_backend_impl.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
 
 #include "base/stl_util.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_backend_impl.h b/webkit/browser/appcache/appcache_backend_impl.h
index 1731c64..26ad9f3 100644
--- a/webkit/appcache/appcache_backend_impl.h
+++ b/webkit/browser/appcache/appcache_backend_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_BACKEND_IMPL_H_
-#define WEBKIT_APPCACHE_APPCACHE_BACKEND_IMPL_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_BACKEND_IMPL_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_BACKEND_IMPL_H_
 
 #include "base/hash_tables.h"
-#include "webkit/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_host.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
@@ -66,4 +66,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheBackendImpl {
 
 }  // namespace
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_BACKEND_IMPL_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_BACKEND_IMPL_H_
diff --git a/webkit/appcache/appcache_database.cc b/webkit/browser/appcache/appcache_database.cc
index 2f14421..a06fa10 100644
--- a/webkit/appcache/appcache_database.cc
+++ b/webkit/browser/appcache/appcache_database.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_database.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ -13,8 +13,8 @@
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_database.h b/webkit/browser/appcache/appcache_database.h
index 1c90278..104aa86 100644
--- a/webkit/appcache/appcache_database.h
+++ b/webkit/browser/appcache/appcache_database.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
-#define WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
 
 #include <map>
 #include <set>
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace sql {
@@ -223,4 +223,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheDatabase {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_DATABASE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_DATABASE_H_
diff --git a/webkit/appcache/appcache_database_unittest.cc b/webkit/browser/appcache/appcache_database_unittest.cc
index da4b96c..24ea404 100644
--- a/webkit/appcache/appcache_database_unittest.cc
+++ b/webkit/browser/appcache/appcache_database_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "testing/gtest/include/gtest/gtest.h"
-
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/stringprintf.h"
@@ -11,8 +9,9 @@
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
-#include "webkit/appcache/appcache_database.h"
-#include "webkit/appcache/appcache_entry.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_entry.h"
 
 namespace {
 
diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/browser/appcache/appcache_disk_cache.cc
index 0f537cc..542ec7c 100644
--- a/webkit/appcache/appcache_disk_cache.cc
+++ b/webkit/browser/appcache/appcache_disk_cache.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_disk_cache.h"
+#include "webkit/browser/appcache/appcache_disk_cache.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
diff --git a/webkit/appcache/appcache_disk_cache.h b/webkit/browser/appcache/appcache_disk_cache.h
index aafc846..9fa8840 100644
--- a/webkit/appcache/appcache_disk_cache.h
+++ b/webkit/browser/appcache/appcache_disk_cache.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_DISK_CACHE_H_
-#define WEBKIT_APPCACHE_APPCACHE_DISK_CACHE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_DISK_CACHE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_DISK_CACHE_H_
 
 #include <set>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/disk_cache/disk_cache.h"
-#include "webkit/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_response.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
@@ -97,4 +97,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheDiskCache
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_DISK_CACHE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_DISK_CACHE_H_
diff --git a/webkit/appcache/appcache_entry.h b/webkit/browser/appcache/appcache_entry.h
index 9092172..01b5f6c 100644
--- a/webkit/appcache/appcache_entry.h
+++ b/webkit/browser/appcache/appcache_entry.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_ENTRY_H_
-#define WEBKIT_APPCACHE_APPCACHE_ENTRY_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_ENTRY_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_ENTRY_H_
 
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_group.cc b/webkit/browser/appcache/appcache_group.cc
index 2ac587c..6e93ea3 100644
--- a/webkit/appcache/appcache_group.cc
+++ b/webkit/browser/appcache/appcache_group.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_group.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/appcache_storage.h"
-#include "webkit/appcache/appcache_update_job.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_update_job.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_group.h b/webkit/browser/appcache/appcache_group.h
index 89da6ec..a3dfdd9 100644
--- a/webkit/appcache/appcache_group.h
+++ b/webkit/browser/appcache/appcache_group.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_GROUP_H_
-#define WEBKIT_APPCACHE_APPCACHE_GROUP_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
 
 #include <map>
 #include <vector>
@@ -164,4 +164,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheGroup
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_GROUP_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_GROUP_H_
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/browser/appcache/appcache_group_unittest.cc
index b4e571d..24dad4d 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/browser/appcache/appcache_group_unittest.cc
@@ -6,12 +6,12 @@
 
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/mock_appcache_service.h"
-#include "webkit/appcache/appcache_update_job.h"
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_update_job.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace {
 
diff --git a/webkit/appcache/appcache_histograms.cc b/webkit/browser/appcache/appcache_histograms.cc
index f0b3c53..574eeb2 100644
--- a/webkit/appcache/appcache_histograms.cc
+++ b/webkit/browser/appcache/appcache_histograms.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
 
 #include "base/metrics/histogram.h"
 
diff --git a/webkit/appcache/appcache_histograms.h b/webkit/browser/appcache/appcache_histograms.h
index 0d9bd78c..7de198a 100644
--- a/webkit/appcache/appcache_histograms.h
+++ b/webkit/browser/appcache/appcache_histograms.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_HISTOGRAMS_H_
-#define WEBKIT_APPCACHE_APPCACHE_HISTOGRAMS_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_HISTOGRAMS_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_HISTOGRAMS_H_
 
 #include "base/basictypes.h"
 
@@ -50,4 +50,4 @@ class AppCacheHistograms {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_HISTOGRAMS_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_HISTOGRAMS_H_
diff --git a/webkit/appcache/appcache_host.cc b/webkit/browser/appcache/appcache_host.cc
index d04fd237..8eb0397 100644
--- a/webkit/appcache/appcache_host.cc
+++ b/webkit/browser/appcache/appcache_host.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_host.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "net/url_request/url_request.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_policy.h"
-#include "webkit/appcache/appcache_request_handler.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_policy.h"
+#include "webkit/browser/appcache/appcache_request_handler.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_host.h b/webkit/browser/appcache/appcache_host.h
index c4dc793..66de2e3 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/browser/appcache/appcache_host.h
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_HOST_H_
-#define WEBKIT_APPCACHE_APPCACHE_HOST_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_HOST_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_HOST_H_
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -288,4 +288,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheHost
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_HOST_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_HOST_H_
diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/browser/appcache/appcache_host_unittest.cc
index eea75c3..e2fbb9c 100644
--- a/webkit/appcache/appcache_host_unittest.cc
+++ b/webkit/browser/appcache/appcache_host_unittest.cc
@@ -8,12 +8,12 @@
 #include "base/message_loop.h"
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/mock_appcache_policy.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/mock_appcache_policy.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_interceptor.cc b/webkit/browser/appcache/appcache_interceptor.cc
index 6342b93..0fa8476 100644
--- a/webkit/appcache/appcache_interceptor.cc
+++ b/webkit/browser/appcache/appcache_interceptor.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_interceptor.h"
-
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_request_handler.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/appcache_url_request_job.h"
+#include "webkit/browser/appcache/appcache_interceptor.h"
+
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_request_handler.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_url_request_job.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_interceptor.h b/webkit/browser/appcache/appcache_interceptor.h
index 29ad738..e086fbb 100644
--- a/webkit/appcache/appcache_interceptor.h
+++ b/webkit/browser/appcache/appcache_interceptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_INTERCEPTOR_H_
-#define WEBKIT_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
 
 #include "base/memory/singleton.h"
 #include "googleurl/src/gurl.h"
@@ -70,4 +70,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheInterceptor
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
diff --git a/webkit/appcache/appcache_policy.h b/webkit/browser/appcache/appcache_policy.h
index 7ed8dc36..0792fc4 100644
--- a/webkit/appcache/appcache_policy.h
+++ b/webkit/browser/appcache/appcache_policy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_POLICY_H_
-#define WEBKIT_APPCACHE_APPCACHE_POLICY_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_POLICY_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_POLICY_H_
 
 class GURL;
 
@@ -29,4 +29,4 @@ class AppCachePolicy {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_POLICY_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_POLICY_H_
diff --git a/webkit/appcache/appcache_quota_client.cc b/webkit/browser/appcache/appcache_quota_client.cc
index a629c99..7f2d647 100644
--- a/webkit/appcache/appcache_quota_client.cc
+++ b/webkit/browser/appcache/appcache_quota_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_quota_client.h"
+#include "webkit/browser/appcache/appcache_quota_client.h"
 
 #include <algorithm>
 #include <map>
@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 using quota::QuotaClient;
 
diff --git a/webkit/appcache/appcache_quota_client.h b/webkit/browser/appcache/appcache_quota_client.h
index d96a55b..14b4329 100644
--- a/webkit/appcache/appcache_quota_client.h
+++ b/webkit/browser/appcache/appcache_quota_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
-#define WEBKIT_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
 
 #include <deque>
 #include <map>
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/common/quota/quota_types.h"
@@ -90,4 +90,4 @@ class AppCacheQuotaClient : public quota::QuotaClient {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
diff --git a/webkit/appcache/appcache_quota_client_unittest.cc b/webkit/browser/appcache/appcache_quota_client_unittest.cc
index f02ec6c..d9d429d 100644
--- a/webkit/appcache/appcache_quota_client_unittest.cc
+++ b/webkit/browser/appcache/appcache_quota_client_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/message_loop_proxy.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache_quota_client.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache_quota_client.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/browser/appcache/appcache_request_handler.cc
index eb0dc73..bf0dfbb 100644
--- a/webkit/appcache/appcache_request_handler.cc
+++ b/webkit/browser/appcache/appcache_request_handler.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_request_handler.h"
+#include "webkit/browser/appcache/appcache_request_handler.h"
 
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_policy.h"
-#include "webkit/appcache/appcache_url_request_job.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_policy.h"
+#include "webkit/browser/appcache/appcache_url_request_job.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_request_handler.h b/webkit/browser/appcache/appcache_request_handler.h
index 42adb70..4eb7bf6 100644
--- a/webkit/appcache/appcache_request_handler.h
+++ b/webkit/browser/appcache/appcache_request_handler.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
-#define WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/supports_user_data.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_host.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -137,4 +137,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheRequestHandler
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/browser/appcache/appcache_request_handler_unittest.cc
index 5343116..f833da2 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/browser/appcache/appcache_request_handler_unittest.cc
@@ -10,20 +10,20 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
-#include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_request_handler.h"
-#include "webkit/appcache/appcache_url_request_job.h"
-#include "webkit/appcache/mock_appcache_policy.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_request_handler.h"
+#include "webkit/browser/appcache/appcache_url_request_job.h"
+#include "webkit/browser/appcache/mock_appcache_policy.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_response.cc b/webkit/browser/appcache/appcache_response.cc
index a331b6ae8..10d28af 100644
--- a/webkit/appcache/appcache_response.cc
+++ b/webkit/browser/appcache/appcache_response.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_response.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -12,9 +12,9 @@
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "net/base/completion_callback.h"
-#include "net/base/net_errors.h"
 #include "net/base/io_buffer.h"
-#include "webkit/appcache/appcache_service.h"
+#include "net/base/net_errors.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_response.h b/webkit/browser/appcache/appcache_response.h
index 7d5db3a..3d992db 100644
--- a/webkit/appcache/appcache_response.h
+++ b/webkit/browser/appcache/appcache_response.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_RESPONSE_H_
-#define WEBKIT_APPCACHE_APPCACHE_RESPONSE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ -12,7 +12,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_info.h"
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace net {
 class IOBuffer;
@@ -255,5 +255,5 @@ class WEBKIT_STORAGE_EXPORT AppCacheResponseWriter : public AppCacheResponseIO {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_RESPONSE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_
 
diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/browser/appcache/appcache_response_unittest.cc
index 6cdcda0..1ed7783 100644
--- a/webkit/appcache/appcache_response_unittest.cc
+++ b/webkit/browser/appcache/appcache_response_unittest.cc
@@ -11,14 +11,14 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/pickle.h"
-#include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 using net::IOBuffer;
 using net::WrappedIOBuffer;
diff --git a/webkit/appcache/appcache_service.cc b/webkit/browser/appcache/appcache_service.cc
index 8f955ee..e4dff4e 100644
--- a/webkit/appcache/appcache_service.cc
+++ b/webkit/browser/appcache/appcache_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 #include <functional>
 
@@ -13,14 +13,14 @@
 #include "base/stl_util.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_histograms.h"
-#include "webkit/appcache/appcache_policy.h"
-#include "webkit/appcache/appcache_quota_client.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage_impl.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_policy.h"
+#include "webkit/browser/appcache/appcache_quota_client.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage_impl.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 
diff --git a/webkit/appcache/appcache_service.h b/webkit/browser/appcache/appcache_service.h
index b1b478e..a830234 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/browser/appcache/appcache_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_SERVICE_H_
-#define WEBKIT_APPCACHE_APPCACHE_SERVICE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_H_
 
 #include <map>
 #include <set>
@@ -13,8 +13,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
@@ -176,4 +176,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheService {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_SERVICE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_H_
diff --git a/webkit/appcache/appcache_service_unittest.cc b/webkit/browser/appcache/appcache_service_unittest.cc
index 43e7f60..e9c4dba 100644
--- a/webkit/appcache/appcache_service_unittest.cc
+++ b/webkit/browser/appcache/appcache_service_unittest.cc
@@ -12,9 +12,9 @@
 #include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/mock_appcache_storage.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/mock_appcache_storage.h"
 
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_storage.cc b/webkit/browser/appcache/appcache_storage.cc
index 8ec9c9a..aaa3100 100644
--- a/webkit/appcache/appcache_storage.cc
+++ b/webkit/browser/appcache/appcache_storage.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_manager.h"
 
diff --git a/webkit/appcache/appcache_storage.h b/webkit/browser/appcache/appcache_storage.h
index 20ca319..eb4df25 100644
--- a/webkit/appcache/appcache_storage.h
+++ b/webkit/browser/appcache/appcache_storage.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_STORAGE_H_
-#define WEBKIT_APPCACHE_APPCACHE_STORAGE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
 
 #include <map>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "webkit/appcache/appcache_working_set.h"
+#include "webkit/browser/appcache/appcache_working_set.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
@@ -318,5 +318,5 @@ class WEBKIT_STORAGE_EXPORT AppCacheStorage {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
 
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/browser/appcache/appcache_storage_impl.cc
index 99df39c..23ee4bc 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/browser/appcache/appcache_storage_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_storage_impl.h"
+#include "webkit/browser/appcache/appcache_storage_impl.h"
 
 #include <algorithm>
 #include <functional>
@@ -20,14 +20,14 @@
 #include "net/base/net_errors.h"
 #include "sql/connection.h"
 #include "sql/transaction.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_database.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_histograms.h"
-#include "webkit/appcache/appcache_quota_client.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_quota_client.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/browser/appcache/appcache_storage_impl.h
index 28fd08b..f92b718 100644
--- a/webkit/appcache/appcache_storage_impl.h
+++ b/webkit/browser/appcache/appcache_storage_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
-#define WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_
 
 #include <deque>
 #include <map>
@@ -15,9 +15,9 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
-#include "webkit/appcache/appcache_database.h"
-#include "webkit/appcache/appcache_disk_cache.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_disk_cache.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace content {
@@ -176,4 +176,4 @@ class AppCacheStorageImpl : public AppCacheStorage {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_IMPL_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_
diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/browser/appcache/appcache_storage_impl_unittest.cc
index 7eb88cd..81d9ae4 100644
--- a/webkit/appcache/appcache_storage_impl_unittest.cc
+++ b/webkit/browser/appcache/appcache_storage_impl_unittest.cc
@@ -12,12 +12,12 @@
 #include "base/threading/thread.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_database.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/appcache_storage_impl.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_database.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_storage_impl.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_storage_unittest.cc b/webkit/browser/appcache/appcache_storage_unittest.cc
index 181ac7f..4f9299c 100644
--- a/webkit/appcache/appcache_storage_unittest.cc
+++ b/webkit/browser/appcache/appcache_storage_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 #include "webkit/browser/quota/mock_quota_manager.h"
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_test_helper.cc b/webkit/browser/appcache/appcache_test_helper.cc
index 9db65fc..fc3fb3e3 100644
--- a/webkit/appcache/appcache_test_helper.cc
+++ b/webkit/browser/appcache/appcache_test_helper.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_test_helper.h"
+#include "webkit/browser/appcache/appcache_test_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_test_helper.h b/webkit/browser/appcache/appcache_test_helper.h
index e2c7884..4e21cb3 100644
--- a/webkit/appcache/appcache_test_helper.h
+++ b/webkit/browser/appcache/appcache_test_helper.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_TEST_HELPER_H_
-#define WEBKIT_APPCACHE_APPCACHE_TEST_HELPER_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_TEST_HELPER_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_TEST_HELPER_H_
 
 #include <set>
 
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 
 namespace appcache {
 
@@ -43,4 +43,4 @@ class AppCacheTestHelper : public appcache::AppCacheStorage::Delegate {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_TEST_HELPER_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_TEST_HELPER_H_
diff --git a/webkit/appcache/appcache_unittest.cc b/webkit/browser/appcache/appcache_unittest.cc
index 68306c8..c0e49204 100644
--- a/webkit/appcache/appcache_unittest.cc
+++ b/webkit/browser/appcache/appcache_unittest.cc
@@ -3,19 +3,42 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_frontend_impl.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 namespace appcache {
 
+namespace {
+
+class MockAppCacheFrontend : public AppCacheFrontend {
+ public:
+  virtual void OnCacheSelected(
+      int host_id, const appcache::AppCacheInfo& info) OVERRIDE {}
+  virtual void OnStatusChanged(const std::vector<int>& host_ids,
+                               Status status) OVERRIDE {}
+  virtual void OnEventRaised(const std::vector<int>& host_ids,
+                             EventID event_id) OVERRIDE {}
+  virtual void OnProgressEventRaised(
+      const std::vector<int>& host_ids,
+      const GURL& url,
+      int num_total, int num_complete) OVERRIDE {}
+  virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
+                                  const std::string& message) OVERRIDE {}
+  virtual void OnLogMessage(int host_id, LogLevel log_level,
+                            const std::string& message) OVERRIDE {}
+  virtual void OnContentBlocked(
+      int host_id, const GURL& manifest_url) OVERRIDE {}
+};
+
+}  // namespace
+
 class AppCacheTest : public testing::Test {
 };
 
 TEST(AppCacheTest, CleanupUnusedCache) {
   MockAppCacheService service;
-  AppCacheFrontendImpl frontend;
+  MockAppCacheFrontend frontend;
   scoped_refptr<AppCache> cache(new AppCache(service.storage(), 111));
   cache->set_complete(true);
   scoped_refptr<AppCacheGroup> group(
@@ -670,4 +693,3 @@ TEST(AppCacheTest, IsNamespaceMatch) {
 }
 
 }  // namespace appacache
-
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/browser/appcache/appcache_update_job.cc
index 1984f37..c59f1da 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/browser/appcache/appcache_update_job.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_update_job.h"
+#include "webkit/browser/appcache/appcache_update_job.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -16,8 +16,8 @@
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_update_job.h b/webkit/browser/appcache/appcache_update_job.h
index 7c250b5..f33979e 100644
--- a/webkit/appcache/appcache_update_job.h
+++ b/webkit/browser/appcache/appcache_update_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_UPDATE_JOB_H_
-#define WEBKIT_APPCACHE_APPCACHE_UPDATE_JOB_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_
 
 #include <deque>
 #include <map>
@@ -17,11 +17,11 @@
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
@@ -307,4 +307,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheUpdateJob
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_UPDATE_JOB_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/browser/appcache/appcache_update_job_unittest.cc
index 336ab8d..a0416f9 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/browser/appcache/appcache_update_job_unittest.cc
@@ -2,24 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "testing/gtest/include/gtest/gtest.h"
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
-#include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_host.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_update_job.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_host.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_update_job.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 namespace appcache {
 class AppCacheUpdateJobTest;
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/browser/appcache/appcache_url_request_job.cc
index fc114b3..afa3aef 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/browser/appcache/appcache_url_request_job.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <vector>
+#include "webkit/browser/appcache/appcache_url_request_job.h"
 
-#include "webkit/appcache/appcache_url_request_job.h"
+#include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -20,8 +20,8 @@
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
-#include "webkit/appcache/appcache_histograms.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_histograms.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_url_request_job.h b/webkit/browser/appcache/appcache_url_request_job.h
index e26be53..a2abcea 100644
--- a/webkit/appcache/appcache_url_request_job.h
+++ b/webkit/browser/appcache/appcache_url_request_job.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_URL_REQUEST_JOB_H_
-#define WEBKIT_APPCACHE_APPCACHE_URL_REQUEST_JOB_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_URL_REQUEST_JOB_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_URL_REQUEST_JOB_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/browser/appcache/appcache_url_request_job_unittest.cc
index 052584f..5c36467 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/browser/appcache/appcache_url_request_job_unittest.cc
@@ -19,9 +19,9 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_url_request_job.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_url_request_job.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 using net::IOBuffer;
 using net::WrappedIOBuffer;
diff --git a/webkit/appcache/appcache_working_set.cc b/webkit/browser/appcache/appcache_working_set.cc
index e7bdf53..ea05110 100644
--- a/webkit/appcache/appcache_working_set.cc
+++ b/webkit/browser/appcache/appcache_working_set.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_working_set.h"
+#include "webkit/browser/appcache/appcache_working_set.h"
 
 #include "base/logging.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_response.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/appcache_working_set.h b/webkit/browser/appcache/appcache_working_set.h
index dcb2716..e156c84 100644
--- a/webkit/appcache/appcache_working_set.h
+++ b/webkit/browser/appcache/appcache_working_set.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_WORKING_SET_H_
-#define WEBKIT_APPCACHE_APPCACHE_WORKING_SET_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_WORKING_SET_H_
+#define WEBKIT_BROWSER_APPCACHE_APPCACHE_WORKING_SET_H_
 
 #include <map>
 
@@ -73,4 +73,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheWorkingSet {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_WORKING_SET_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_WORKING_SET_H_
diff --git a/webkit/appcache/manifest_parser.cc b/webkit/browser/appcache/manifest_parser.cc
index 0e76e93..3bc3be0 100644
--- a/webkit/appcache/manifest_parser.cc
+++ b/webkit/browser/appcache/manifest_parser.cc
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "webkit/appcache/manifest_parser.h"
+#include "webkit/browser/appcache/manifest_parser.h"
 
 #include "base/command_line.h"
 #include "base/i18n/icu_string_conversions.h"
diff --git a/webkit/appcache/manifest_parser.h b/webkit/browser/appcache/manifest_parser.h
index 25fde8c..9bf5d00 100644
--- a/webkit/appcache/manifest_parser.h
+++ b/webkit/browser/appcache/manifest_parser.h
@@ -29,14 +29,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WEBKIT_APPCACHE_MANIFEST_PARSER_H_
-#define WEBKIT_APPCACHE_MANIFEST_PARSER_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
+#define WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
@@ -61,4 +61,4 @@ WEBKIT_STORAGE_EXPORT bool ParseManifest(const GURL& manifest_url,
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_MANIFEST_PARSER_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_
diff --git a/webkit/appcache/manifest_parser_unittest.cc b/webkit/browser/appcache/manifest_parser_unittest.cc
index 84cf7cd..c973392 100644
--- a/webkit/appcache/manifest_parser_unittest.cc
+++ b/webkit/browser/appcache/manifest_parser_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/manifest_parser.h"
+#include "webkit/browser/appcache/manifest_parser.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/mock_appcache_policy.cc b/webkit/browser/appcache/mock_appcache_policy.cc
index 04ef3c3..b74d754d 100644
--- a/webkit/appcache/mock_appcache_policy.cc
+++ b/webkit/browser/appcache/mock_appcache_policy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/mock_appcache_policy.h"
+#include "webkit/browser/appcache/mock_appcache_policy.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/mock_appcache_policy.h b/webkit/browser/appcache/mock_appcache_policy.h
index 5c70002..0c47541 100644
--- a/webkit/appcache/mock_appcache_policy.h
+++ b/webkit/browser/appcache/mock_appcache_policy.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_MOCK_APPCACHE_POLICY_H_
-#define WEBKIT_APPCACHE_MOCK_APPCACHE_POLICY_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_POLICY_H_
+#define WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_POLICY_H_
 
 #include "base/compiler_specific.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_policy.h"
+#include "webkit/browser/appcache/appcache_policy.h"
 
 namespace appcache {
 
@@ -28,4 +28,4 @@ class MockAppCachePolicy : public AppCachePolicy {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_MOCK_APPCACHE_POLICY_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_POLICY_H_
diff --git a/webkit/appcache/mock_appcache_service.cc b/webkit/browser/appcache/mock_appcache_service.cc
index 792d774..6f3218d 100644
--- a/webkit/appcache/mock_appcache_service.cc
+++ b/webkit/browser/appcache/mock_appcache_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/webkit/appcache/mock_appcache_service.h b/webkit/browser/appcache/mock_appcache_service.h
index 3249024..4c8cfa5 100644
--- a/webkit/appcache/mock_appcache_service.h
+++ b/webkit/browser/appcache/mock_appcache_service.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_MOCK_APPCACHE_SERVICE_H_
-#define WEBKIT_APPCACHE_MOCK_APPCACHE_SERVICE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_SERVICE_H_
+#define WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_SERVICE_H_
 
 #include "base/compiler_specific.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/mock_appcache_storage.h"
+#include "webkit/browser/appcache/appcache_service.h"
+#include "webkit/browser/appcache/mock_appcache_storage.h"
 #include "webkit/browser/quota/quota_manager.h"
 
 namespace appcache {
@@ -45,4 +45,4 @@ class MockAppCacheService : public AppCacheService {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_MOCK_APPCACHE_SERVICE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_SERVICE_H_
diff --git a/webkit/appcache/mock_appcache_storage.cc b/webkit/browser/appcache/mock_appcache_storage.cc
index 27c974d..ce6dbb7 100644
--- a/webkit/appcache/mock_appcache_storage.cc
+++ b/webkit/browser/appcache/mock_appcache_storage.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/mock_appcache_storage.h"
+#include "webkit/browser/appcache/mock_appcache_storage.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_entry.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 // This is a quick and easy 'mock' implementation of the storage interface
 // that doesn't put anything to disk.
diff --git a/webkit/appcache/mock_appcache_storage.h b/webkit/browser/appcache/mock_appcache_storage.h
index b1f9a83..d89ffbe 100644
--- a/webkit/appcache/mock_appcache_storage.h
+++ b/webkit/browser/appcache/mock_appcache_storage.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_MOCK_APPCACHE_STORAGE_H_
-#define WEBKIT_APPCACHE_MOCK_APPCACHE_STORAGE_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_STORAGE_H_
+#define WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_STORAGE_H_
 
 #include <deque>
 #include <map>
@@ -14,11 +14,11 @@
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_disk_cache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_disk_cache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage.h"
 
 namespace appcache {
 
@@ -215,4 +215,4 @@ class MockAppCacheStorage : public AppCacheStorage {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_MOCK_APPCACHE_STORAGE_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_MOCK_APPCACHE_STORAGE_H_
diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/browser/appcache/mock_appcache_storage_unittest.cc
index 0f17b75..a2faeff 100644
--- a/webkit/appcache/mock_appcache_storage_unittest.cc
+++ b/webkit/browser/appcache/mock_appcache_storage_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_storage.h"
-#include "webkit/appcache/mock_appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_storage.h"
+#include "webkit/browser/appcache/mock_appcache_service.h"
 
 namespace appcache {
 
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/browser/appcache/view_appcache_internals_job.cc
index 9c207d0..217089c 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/browser/appcache/view_appcache_internals_job.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "webkit/browser/appcache/view_appcache_internals_job.h"
+
 #include <algorithm>
 #include <string>
 
-#include "webkit/appcache/view_appcache_internals_job.h"
-
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ -24,11 +24,11 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_simple_job.h"
 #include "net/url_request/view_cache_helper.h"
-#include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_group.h"
-#include "webkit/appcache/appcache_policy.h"
-#include "webkit/appcache/appcache_response.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache.h"
+#include "webkit/browser/appcache/appcache_group.h"
+#include "webkit/browser/appcache/appcache_policy.h"
+#include "webkit/browser/appcache/appcache_response.h"
+#include "webkit/browser/appcache/appcache_service.h"
 
 namespace appcache {
 namespace {
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/browser/appcache/view_appcache_internals_job.h
index e51ada1..70dea8e 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/browser/appcache/view_appcache_internals_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
-#define WEBKIT_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#ifndef WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#define WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
 
 #include "base/basictypes.h"
 #include "webkit/storage/webkit_storage_export.h"
@@ -31,4 +31,4 @@ class WEBKIT_STORAGE_EXPORT ViewAppCacheInternalsJobFactory {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#endif  // WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
diff --git a/webkit/browser/appcache/webkit_browser_appcache.gypi b/webkit/browser/appcache/webkit_browser_appcache.gypi
new file mode 100644
index 0000000..33ec9b5
--- /dev/null
+++ b/webkit/browser/appcache/webkit_browser_appcache.gypi
@@ -0,0 +1,50 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'webkit_browser_appcache_sources': [
+      '../browser/appcache/appcache.cc',
+      '../browser/appcache/appcache.h',
+      '../browser/appcache/appcache_backend_impl.cc',
+      '../browser/appcache/appcache_backend_impl.h',
+      '../browser/appcache/appcache_database.cc',
+      '../browser/appcache/appcache_database.h',
+      '../browser/appcache/appcache_disk_cache.cc',
+      '../browser/appcache/appcache_disk_cache.h',
+      '../browser/appcache/appcache_entry.h',
+      '../browser/appcache/appcache_group.cc',
+      '../browser/appcache/appcache_group.h',
+      '../browser/appcache/appcache_histograms.cc',
+      '../browser/appcache/appcache_histograms.h',
+      '../browser/appcache/appcache_host.cc',
+      '../browser/appcache/appcache_host.h',
+      '../browser/appcache/appcache_interceptor.cc',
+      '../browser/appcache/appcache_interceptor.h',
+      '../browser/appcache/appcache_policy.h',
+      '../browser/appcache/appcache_quota_client.cc',
+      '../browser/appcache/appcache_quota_client.h',
+      '../browser/appcache/appcache_request_handler.cc',
+      '../browser/appcache/appcache_request_handler.h',
+      '../browser/appcache/appcache_response.cc',
+      '../browser/appcache/appcache_response.h',
+      '../browser/appcache/appcache_service.cc',
+      '../browser/appcache/appcache_service.h',
+      '../browser/appcache/appcache_storage.cc',
+      '../browser/appcache/appcache_storage.h',
+      '../browser/appcache/appcache_storage_impl.cc',
+      '../browser/appcache/appcache_storage_impl.h',
+      '../browser/appcache/appcache_working_set.cc',
+      '../browser/appcache/appcache_working_set.h',
+      '../browser/appcache/appcache_update_job.cc',
+      '../browser/appcache/appcache_update_job.h',
+      '../browser/appcache/appcache_url_request_job.cc',
+      '../browser/appcache/appcache_url_request_job.h',
+      '../browser/appcache/manifest_parser.cc',
+      '../browser/appcache/manifest_parser.h',
+      '../browser/appcache/view_appcache_internals_job.h',
+      '../browser/appcache/view_appcache_internals_job.cc',
+    ],
+  },
+}
diff --git a/webkit/browser/webkit_browser.gypi b/webkit/browser/webkit_browser.gypi
index 2123168..f779bc7 100644
--- a/webkit/browser/webkit_browser.gypi
+++ b/webkit/browser/webkit_browser.gypi
@@ -4,6 +4,7 @@
 
 {
   'includes': [
+    '../browser/appcache/webkit_browser_appcache.gypi',
     '../browser/blob/webkit_browser_blob.gypi',
     '../browser/database/webkit_browser_database.gypi',
     '../browser/dom_storage/webkit_browser_dom_storage.gypi',
@@ -14,6 +15,7 @@
   # webkit_storage.gypi.
   'variables': {
     'webkit_browser_storage_sources': [
+      '<@(webkit_browser_appcache_sources)',
       '<@(webkit_browser_blob_sources)',
       '<@(webkit_browser_database_sources)',
       '<@(webkit_browser_dom_storage_sources)',
diff --git a/webkit/appcache/appcache_interfaces.cc b/webkit/common/appcache/appcache_interfaces.cc
index b62becc..f9ed706 100644
--- a/webkit/appcache/appcache_interfaces.cc
+++ b/webkit/common/appcache/appcache_interfaces.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 #include <set>
 
@@ -10,11 +10,6 @@
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHost.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
-
-using WebKit::WebApplicationCacheHost;
-using WebKit::WebConsoleMessage;
 
 namespace {
 
@@ -132,43 +127,4 @@ bool IsSchemeAndMethodSupported(const net::URLRequest* request) {
          IsMethodSupported(request->method());
 }
 
-// Ensure that enum values never get out of sync with the
-// ones declared for use within the WebKit api
-COMPILE_ASSERT((int)WebApplicationCacheHost::Uncached ==
-               (int)UNCACHED, Uncached);
-COMPILE_ASSERT((int)WebApplicationCacheHost::Idle ==
-               (int)IDLE, Idle);
-COMPILE_ASSERT((int)WebApplicationCacheHost::Checking ==
-               (int)CHECKING, Checking);
-COMPILE_ASSERT((int)WebApplicationCacheHost::Downloading ==
-               (int)DOWNLOADING, Downloading);
-COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReady ==
-               (int)UPDATE_READY, UpdateReady);
-COMPILE_ASSERT((int)WebApplicationCacheHost::Obsolete ==
-               (int)OBSOLETE, Obsolete);
-COMPILE_ASSERT((int)WebApplicationCacheHost::CheckingEvent ==
-               (int)CHECKING_EVENT, CheckingEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::ErrorEvent ==
-               (int)ERROR_EVENT, ErrorEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::NoUpdateEvent ==
-               (int)NO_UPDATE_EVENT, NoUpdateEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::DownloadingEvent ==
-               (int)DOWNLOADING_EVENT, DownloadingEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::ProgressEvent ==
-               (int)PROGRESS_EVENT, ProgressEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReadyEvent ==
-               (int)UPDATE_READY_EVENT, UpdateReadyEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::CachedEvent ==
-               (int)CACHED_EVENT, CachedEvent);
-COMPILE_ASSERT((int)WebApplicationCacheHost::ObsoleteEvent ==
-               (int)OBSOLETE_EVENT, ObsoleteEvent);
-COMPILE_ASSERT((int)WebConsoleMessage::LevelDebug ==
-               (int)LOG_DEBUG, LevelDebug);
-COMPILE_ASSERT((int)WebConsoleMessage::LevelLog ==
-               (int)LOG_INFO, LevelLog);
-COMPILE_ASSERT((int)WebConsoleMessage::LevelWarning ==
-               (int)LOG_WARNING, LevelWarning);
-COMPILE_ASSERT((int)WebConsoleMessage::LevelError ==
-               (int)LOG_ERROR, LevelError);
-
 }  // namespace appcache
diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/common/appcache/appcache_interfaces.h
index 168a8d1..38b6955 100644
--- a/webkit/appcache/appcache_interfaces.h
+++ b/webkit/common/appcache/appcache_interfaces.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_INTERFACES_H_
-#define WEBKIT_APPCACHE_APPCACHE_INTERFACES_H_
+#ifndef WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
+#define WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
 
 #include <string>
 #include <vector>
@@ -188,4 +188,4 @@ WEBKIT_STORAGE_EXPORT extern const base::FilePath::CharType
 
 }  // namespace
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_INTERFACES_H_
+#endif  // WEBKIT_COMMON_APPCACHE_APPCACHE_INTERFACES_H_
diff --git a/webkit/common/webkit_common.gypi b/webkit/common/webkit_common.gypi
index 0db1aba..950c265 100644
--- a/webkit/common/webkit_common.gypi
+++ b/webkit/common/webkit_common.gypi
@@ -19,6 +19,8 @@
       '<@(webkit_common_dom_storage_sources)',
       '<@(webkit_common_fileapi_sources)',
       '<@(webkit_common_quota_sources)',
+      '../common/appcache/appcache_interfaces.cc',
+      '../common/appcache/appcache_interfaces.h',
     ],
   },
 
diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc
index 395d88d..23de004 100644
--- a/webkit/glue/resource_loader_bridge.cc
+++ b/webkit/glue/resource_loader_bridge.cc
@@ -4,8 +4,8 @@
 
 #include "webkit/glue/resource_loader_bridge.h"
 
-#include "webkit/appcache/appcache_interfaces.h"
 #include "net/http/http_response_headers.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index c969dc2..71ce0a2 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -19,16 +19,6 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebCookieJar.h"
-#include "third_party/WebKit/public/platform/WebData.h"
-#include "third_party/WebKit/public/platform/WebHTTPBody.h"
-#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/platform/WebURLLoader.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
-#include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -39,14 +29,24 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebCString.h"
+#include "third_party/WebKit/public/platform/WebCookieJar.h"
+#include "third_party/WebKit/public/platform/WebData.h"
+#include "third_party/WebKit/public/platform/WebHTTPBody.h"
+#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
+#include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
+#include "third_party/WebKit/public/platform/WebURLLoader.h"
+#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
+#include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "ui/gfx/rect.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/plugins/npapi/plugin_host.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/plugin_constants.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 using appcache::WebApplicationCacheHostImpl;
diff --git a/webkit/appcache/appcache_frontend_impl.cc b/webkit/renderer/appcache/appcache_frontend_impl.cc
index f39cbd2..78e412f 100644
--- a/webkit/appcache/appcache_frontend_impl.cc
+++ b/webkit/renderer/appcache/appcache_frontend_impl.cc
@@ -2,10 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/appcache_frontend_impl.h"
+#include "webkit/renderer/appcache/appcache_frontend_impl.h"
 
 #include "base/logging.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHost.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
+
+using WebKit::WebApplicationCacheHost;
+using WebKit::WebConsoleMessage;
 
 namespace appcache {
 
@@ -79,4 +84,43 @@ void AppCacheFrontendImpl::OnContentBlocked(int host_id,
     host->OnContentBlocked(manifest_url);
 }
 
+// Ensure that enum values never get out of sync with the
+// ones declared for use within the WebKit api
+COMPILE_ASSERT((int)WebApplicationCacheHost::Uncached ==
+               (int)UNCACHED, Uncached);
+COMPILE_ASSERT((int)WebApplicationCacheHost::Idle ==
+               (int)IDLE, Idle);
+COMPILE_ASSERT((int)WebApplicationCacheHost::Checking ==
+               (int)CHECKING, Checking);
+COMPILE_ASSERT((int)WebApplicationCacheHost::Downloading ==
+               (int)DOWNLOADING, Downloading);
+COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReady ==
+               (int)UPDATE_READY, UpdateReady);
+COMPILE_ASSERT((int)WebApplicationCacheHost::Obsolete ==
+               (int)OBSOLETE, Obsolete);
+COMPILE_ASSERT((int)WebApplicationCacheHost::CheckingEvent ==
+               (int)CHECKING_EVENT, CheckingEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::ErrorEvent ==
+               (int)ERROR_EVENT, ErrorEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::NoUpdateEvent ==
+               (int)NO_UPDATE_EVENT, NoUpdateEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::DownloadingEvent ==
+               (int)DOWNLOADING_EVENT, DownloadingEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::ProgressEvent ==
+               (int)PROGRESS_EVENT, ProgressEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::UpdateReadyEvent ==
+               (int)UPDATE_READY_EVENT, UpdateReadyEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::CachedEvent ==
+               (int)CACHED_EVENT, CachedEvent);
+COMPILE_ASSERT((int)WebApplicationCacheHost::ObsoleteEvent ==
+               (int)OBSOLETE_EVENT, ObsoleteEvent);
+COMPILE_ASSERT((int)WebConsoleMessage::LevelDebug ==
+               (int)LOG_DEBUG, LevelDebug);
+COMPILE_ASSERT((int)WebConsoleMessage::LevelLog ==
+               (int)LOG_INFO, LevelLog);
+COMPILE_ASSERT((int)WebConsoleMessage::LevelWarning ==
+               (int)LOG_WARNING, LevelWarning);
+COMPILE_ASSERT((int)WebConsoleMessage::LevelError ==
+               (int)LOG_ERROR, LevelError);
+
 }  // namespace appcache
diff --git a/webkit/appcache/appcache_frontend_impl.h b/webkit/renderer/appcache/appcache_frontend_impl.h
index 0f20db4..ccca377 100644
--- a/webkit/appcache/appcache_frontend_impl.h
+++ b/webkit/renderer/appcache/appcache_frontend_impl.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
-#define WEBKIT_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
+#ifndef WEBKIT_RENDERER_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
+#define WEBKIT_RENDERER_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
 
 #include <string>
 #include <vector>
-#include "webkit/appcache/appcache_interfaces.h"
+
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
@@ -32,4 +33,4 @@ class WEBKIT_STORAGE_EXPORT AppCacheFrontendImpl : public AppCacheFrontend {
 
 }  // namespace
 
-#endif  // WEBKIT_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
+#endif  // WEBKIT_RENDERER_APPCACHE_APPCACHE_FRONTEND_IMPL_H_
diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/renderer/appcache/web_application_cache_host_impl.cc
index 0b44238..f531674 100644
--- a/webkit/appcache/web_application_cache_host_impl.cc
+++ b/webkit/renderer/appcache/web_application_cache_host_impl.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/appcache/web_application_cache_host_impl.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/renderer/appcache/web_application_cache_host_impl.h
index 90bccbc..8abe748 100644
--- a/webkit/appcache/web_application_cache_host_impl.h
+++ b/webkit/renderer/appcache/web_application_cache_host_impl.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
-#define WEBKIT_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
+#ifndef WEBKIT_RENDERER_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
+#define WEBKIT_RENDERER_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
 
 #include <string>
 
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h"
-#include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace WebKit {
@@ -83,4 +83,4 @@ class WEBKIT_STORAGE_EXPORT WebApplicationCacheHostImpl
 
 }  // namespace
 
-#endif  // WEBKIT_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
+#endif  // WEBKIT_RENDERER_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index 8253bf1..a629848 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -4,8 +4,6 @@
 
 {
   'includes': [
-    '../appcache/webkit_appcache.gypi',
-
     # TODO(kinuko): Deprecate this when we have a new target for
     # webkit_browser.  crbug.com/239710
     '../browser/webkit_browser.gypi',
@@ -31,12 +29,15 @@
       'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
       'sources': [
         '../storage/webkit_storage_export.h',
-        '<@(webkit_appcache_sources)',
 
         # TODO(kinuko): Deprecate them when we have new targets for
         # browser|common|renderer.  crbug.com/239710
         '<@(webkit_browser_storage_sources)',
         '<@(webkit_common_storage_sources)',
+        '../renderer/appcache/appcache_frontend_impl.cc',
+        '../renderer/appcache/appcache_frontend_impl.h',
+        '../renderer/appcache/web_application_cache_host_impl.cc',
+        '../renderer/appcache/web_application_cache_host_impl.h',
         '../renderer/dom_storage/dom_storage_cached_area.cc',
         '../renderer/dom_storage/dom_storage_cached_area.h',
         '../renderer/dom_storage/dom_storage_proxy.h',
diff --git a/webkit/support/simple_appcache_system.cc b/webkit/support/simple_appcache_system.cc
index 1305bc9..bf87be9 100644
--- a/webkit/support/simple_appcache_system.cc
+++ b/webkit/support/simple_appcache_system.cc
@@ -11,8 +11,8 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/synchronization/waitable_event.h"
-#include "webkit/appcache/appcache_interceptor.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
+#include "webkit/browser/appcache/appcache_interceptor.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/support/simple_resource_loader_bridge.h"
 
 using WebKit::WebApplicationCacheHost;
diff --git a/webkit/support/simple_appcache_system.h b/webkit/support/simple_appcache_system.h
index c07a52f..a21b882 100644
--- a/webkit/support/simple_appcache_system.h
+++ b/webkit/support/simple_appcache_system.h
@@ -8,10 +8,10 @@
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
-#include "webkit/appcache/appcache_backend_impl.h"
-#include "webkit/appcache/appcache_frontend_impl.h"
-#include "webkit/appcache/appcache_service.h"
+#include "webkit/browser/appcache/appcache_backend_impl.h"
+#include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/renderer/appcache/appcache_frontend_impl.h"
 
 namespace WebKit {
 class WebApplicationCacheHost;
diff --git a/webkit/support/simple_resource_loader_bridge.cc b/webkit/support/simple_resource_loader_bridge.cc
index 42701a8..5e8462c 100644
--- a/webkit/support/simple_resource_loader_bridge.cc
+++ b/webkit/support/simple_resource_loader_bridge.cc
@@ -61,12 +61,12 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
-#include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/browser/blob/blob_storage_controller.h"
 #include "webkit/browser/blob/blob_url_request_job.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_dir_url_request_job.h"
 #include "webkit/browser/fileapi/file_system_url_request_job.h"
+#include "webkit/common/appcache/appcache_interfaces.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/resource_request_body.h"
diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc
index 806db54..abbcdee 100644
--- a/webkit/support/test_webkit_platform_support.cc
+++ b/webkit/support/test_webkit_platform_support.cc
@@ -16,6 +16,12 @@
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
 #include "third_party/WebKit/public/platform/WebAudioDevice.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebFileSystem.h"
@@ -24,14 +30,7 @@
 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h"
 #include "v8/include/v8.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/browser/database/vfs_backend.h"
 #include "webkit/common/gpu/test_context_provider_factory.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
@@ -41,6 +40,7 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/support/gc_extension.h"
 #include "webkit/support/mock_webclipboard_impl.h"
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 03408df..ba537a8 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -37,20 +37,19 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebStorageNamespace.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebStorageNamespace.h"
+#include "third_party/WebKit/public/platform/WebURLError.h"
 #if defined(TOOLKIT_GTK)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/common/gpu/test_context_provider_factory.h"
@@ -65,6 +64,7 @@
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
+#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/renderer/media/media_stream_client.h"
 #include "webkit/renderer/media/webmediaplayer_impl.h"
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 4a0a942..9e3f90f 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -10,7 +10,6 @@
     ['OS != "ios"', {
       'includes': [
         '../../build/win_precompile.gypi',
-        '../appcache/webkit_appcache.gypi',
         '../base/webkit_base.gypi',
         '../glue/webkit_glue.gypi',
         '../plugins/webkit_plugins.gypi',