Move AppCache common code to content and split off AppCache messages into their own file. Also move WebMessagePortChannel and WebDatabaseObserverImpl to content.

TBR=michaeln
Review URL: http://codereview.chromium.org/6691002

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

29 files changed, 212 insertions, 374 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e2b45b3..1ddbac4 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -166,16 +166,11 @@
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:glue',
       ],
       'sources': [
         # .cc, .h, and .mm files under chrome/common that are not required for
         # building 64-bit Windows targets. Test files are not included.
-        'common/appcache/appcache_backend_proxy.cc',
-        'common/appcache/appcache_backend_proxy.h',
-        'common/appcache/appcache_dispatcher.cc',
-        'common/appcache/appcache_dispatcher.h',
         'common/automation_constants.cc',
         'common/automation_constants.h',
         'common/automation_messages.cc',
@@ -300,14 +295,10 @@
         'common/visitedlink_common.h',
         'common/web_apps.cc',
         'common/web_apps.h',
-        'common/web_database_observer_impl.cc',
-        'common/web_database_observer_impl.h',
         'common/web_resource/web_resource_unpacker.cc',
         'common/web_resource/web_resource_unpacker.h',
         'common/webkit_param_traits.cc',
         'common/webkit_param_traits.h',
-        'common/webmessageportchannel_impl.cc',
-        'common/webmessageportchannel_impl.h',
         'common/window_container_type.cc',
         'common/window_container_type.h',
         'common/worker_thread_ticker.cc',
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 851bf39..124a259 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -651,92 +651,6 @@ void ParamTraits<ExtensionExtent>::Log(const param_type& p, std::string* l) {
   LogParam(p.patterns(), l);
 }
 
-void ParamTraits<appcache::AppCacheResourceInfo>::Write(Message* m,
-                                                        const param_type& p) {
-  WriteParam(m, p.url);
-  WriteParam(m, p.size);
-  WriteParam(m, p.is_manifest);
-  WriteParam(m, p.is_master);
-  WriteParam(m, p.is_fallback);
-  WriteParam(m, p.is_foreign);
-  WriteParam(m, p.is_explicit);
-}
-
-bool ParamTraits<appcache::AppCacheResourceInfo>::Read(
-    const Message* m, void** iter, param_type* p) {
-  return ReadParam(m, iter, &p->url) &&
-      ReadParam(m, iter, &p->size) &&
-      ReadParam(m, iter, &p->is_manifest) &&
-      ReadParam(m, iter, &p->is_master) &&
-      ReadParam(m, iter, &p->is_fallback) &&
-      ReadParam(m, iter, &p->is_foreign) &&
-      ReadParam(m, iter, &p->is_explicit);
-}
-
-void ParamTraits<appcache::AppCacheResourceInfo>::Log(const param_type& p,
-                                                      std::string* l) {
-  l->append("(");
-  LogParam(p.url, l);
-  l->append(", ");
-  LogParam(p.size, l);
-  l->append(", ");
-  LogParam(p.is_manifest, l);
-  l->append(", ");
-  LogParam(p.is_master, l);
-  l->append(", ");
-  LogParam(p.is_fallback, l);
-  l->append(", ");
-  LogParam(p.is_foreign, l);
-  l->append(", ");
-  LogParam(p.is_explicit, l);
-  l->append(")");
-}
-
-void ParamTraits<appcache::AppCacheInfo>::Write(Message* m,
-                                                const param_type& p) {
-  WriteParam(m, p.manifest_url);
-  WriteParam(m, p.creation_time);
-  WriteParam(m, p.last_update_time);
-  WriteParam(m, p.last_access_time);
-  WriteParam(m, p.cache_id);
-  WriteParam(m, p.status);
-  WriteParam(m, p.size);
-  WriteParam(m, p.is_complete);
-}
-
-bool ParamTraits<appcache::AppCacheInfo>::Read(const Message* m, void** iter,
-                                               param_type* p) {
-  return ReadParam(m, iter, &p->manifest_url) &&
-      ReadParam(m, iter, &p->creation_time) &&
-      ReadParam(m, iter, &p->last_update_time) &&
-      ReadParam(m, iter, &p->last_access_time) &&
-      ReadParam(m, iter, &p->cache_id) &&
-      ReadParam(m, iter, &p->status) &&
-      ReadParam(m, iter, &p->size) &&
-      ReadParam(m, iter, &p->is_complete);
-}
-
-void ParamTraits<appcache::AppCacheInfo>::Log(const param_type& p,
-                                              std::string* l) {
-  l->append("(");
-  LogParam(p.manifest_url, l);
-  l->append(", ");
-  LogParam(p.creation_time, l);
-  l->append(", ");
-  LogParam(p.last_update_time, l);
-  l->append(", ");
-  LogParam(p.last_access_time, l);
-  l->append(", ");
-  LogParam(p.cache_id, l);
-  l->append(", ");
-  LogParam(p.status, l);
-  l->append(", ");
-  LogParam(p.size, l);
-  l->append(")");
-  LogParam(p.is_complete, l);
-  l->append(", ");
-}
-
 void ParamTraits<webkit_glue::WebAccessibility>::Write(Message* m,
                                                        const param_type& p) {
   WriteParam(m, p.id);
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 9c7b3d9..3c8d989 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -54,7 +54,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
-#include "webkit/appcache/appcache_interfaces.h"  // enum appcache::Status
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcookie.h"
@@ -226,98 +225,6 @@ struct ParamTraits<gfx::NativeView> {
 
 #endif  // defined(OS_POSIX)
 
-template <>
-struct ParamTraits<appcache::Status> {
-  typedef appcache::Status param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteInt(static_cast<int>(p));
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    int type;
-    if (!m->ReadInt(iter, &type))
-      return false;
-    *p = static_cast<param_type>(type);
-    return true;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    std::string state;
-    switch (p) {
-      case appcache::UNCACHED:
-        state = "UNCACHED";
-        break;
-      case appcache::IDLE:
-        state = "IDLE";
-        break;
-      case appcache::CHECKING:
-        state = "CHECKING";
-        break;
-      case appcache::DOWNLOADING:
-        state = "DOWNLOADING";
-        break;
-      case appcache::UPDATE_READY:
-        state = "UPDATE_READY";
-        break;
-      case appcache::OBSOLETE:
-        state = "OBSOLETE";
-        break;
-      default:
-        state = "InvalidStatusValue";
-        break;
-    }
-
-    LogParam(state, l);
-  }
-};
-
-template <>
-struct ParamTraits<appcache::EventID> {
-  typedef appcache::EventID param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteInt(static_cast<int>(p));
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    int type;
-    if (!m->ReadInt(iter, &type))
-      return false;
-    *p = static_cast<param_type>(type);
-    return true;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    std::string state;
-    switch (p) {
-      case appcache::CHECKING_EVENT:
-        state = "CHECKING_EVENT";
-        break;
-      case appcache::ERROR_EVENT:
-        state = "ERROR_EVENT";
-        break;
-      case appcache::NO_UPDATE_EVENT:
-        state = "NO_UPDATE_EVENT";
-        break;
-      case appcache::DOWNLOADING_EVENT:
-        state = "DOWNLOADING_EVENT";
-        break;
-      case appcache::PROGRESS_EVENT:
-        state = "PROGRESS_EVENT";
-        break;
-      case appcache::UPDATE_READY_EVENT:
-        state = "UPDATE_READY_EVENT";
-        break;
-      case appcache::CACHED_EVENT:
-        state = "CACHED_EVENT";
-        break;
-      case appcache::OBSOLETE_EVENT:
-        state = "OBSOLETE_EVENT";
-        break;
-      default:
-        state = "InvalidEventValue";
-        break;
-    }
-
-    LogParam(state, l);
-  }
-};
-
 template<>
 struct ParamTraits<WebMenuItem> {
   typedef WebMenuItem param_type;
@@ -376,23 +283,6 @@ struct ParamTraits<ExtensionExtent> {
   static void Log(const param_type& p, std::string* l);
 };
 
-
-template<>
-struct ParamTraits<appcache::AppCacheResourceInfo> {
-  typedef appcache::AppCacheResourceInfo param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
-struct ParamTraits<appcache::AppCacheInfo> {
-  typedef appcache::AppCacheInfo param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
 template <>
 struct ParamTraits<webkit_glue::WebAccessibility> {
   typedef webkit_glue::WebAccessibility param_type;
@@ -951,46 +841,6 @@ IPC_MESSAGE_ROUTED3(ViewMsg_HandleMessageFromExternalHost,
 // into a full window).
 IPC_MESSAGE_ROUTED0(ViewMsg_DisassociateFromPopupCount)
 
-// Notifies the renderer of the appcache that has been selected for a
-// a particular host. This is sent in reply to AppCacheMsg_SelectCache.
-IPC_MESSAGE_CONTROL2(AppCacheMsg_CacheSelected,
-                     int /* host_id */,
-                     appcache::AppCacheInfo)
-
-// Notifies the renderer of an AppCache status change.
-IPC_MESSAGE_CONTROL2(AppCacheMsg_StatusChanged,
-                     std::vector<int> /* host_ids */,
-                     appcache::Status)
-
-// Notifies the renderer of an AppCache event other than the
-// progress event which has a seperate message.
-IPC_MESSAGE_CONTROL2(AppCacheMsg_EventRaised,
-                     std::vector<int> /* host_ids */,
-                     appcache::EventID)
-
-// Notifies the renderer of an AppCache progress event.
-IPC_MESSAGE_CONTROL4(AppCacheMsg_ProgressEventRaised,
-                     std::vector<int> /* host_ids */,
-                     GURL /* url being processed */,
-                     int /* total */,
-                     int /* complete */)
-
-// Notifies the renderer of an AppCache error event.
-IPC_MESSAGE_CONTROL2(AppCacheMsg_ErrorEventRaised,
-                     std::vector<int> /* host_ids */,
-                     std::string /* error_message */)
-
-// Notifies the renderer of an AppCache logging message.
-IPC_MESSAGE_CONTROL3(AppCacheMsg_LogMessage,
-                     int /* host_id */,
-                     int /* log_level */,
-                     std::string /* message */)
-
-// Notifies the renderer of the fact that AppCache access was blocked.
-IPC_MESSAGE_CONTROL2(AppCacheMsg_ContentBlocked,
-                     int /* host_id */,
-                     GURL /* manifest_url */)
-
 // Sent by the Browser process to alert a window about whether a it should
 // allow a scripted window.close(). The renderer assumes every new window is a
 // blocked popup until notified otherwise.
@@ -2088,64 +1938,6 @@ IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_GetRootWindowRect,
                            gfx::NativeViewId /* window */,
                            gfx::Rect /* Out: Window location */)
 
-// Informs the browser of a new appcache host.
-IPC_MESSAGE_CONTROL1(AppCacheMsg_RegisterHost,
-                     int /* host_id */)
-
-// Informs the browser of an appcache host being destroyed.
-IPC_MESSAGE_CONTROL1(AppCacheMsg_UnregisterHost,
-                     int /* host_id */)
-
-// Initiates the cache selection algorithm for the given host.
-// This is sent prior to any subresource loads. An AppCacheMsg_CacheSelected
-// message will be sent in response.
-// 'host_id' indentifies a specific document or worker
-// 'document_url' the url of the main resource
-// 'appcache_document_was_loaded_from' the id of the appcache the main
-//     resource was loaded from or kNoCacheId
-// 'opt_manifest_url' the manifest url specified in the <html> tag if any
-IPC_MESSAGE_CONTROL4(AppCacheMsg_SelectCache,
-                     int /* host_id */,
-                     GURL  /* document_url */,
-                     int64 /* appcache_document_was_loaded_from */,
-                     GURL  /* opt_manifest_url */)
-
-// Initiates worker specific cache selection algorithm for the given host.
-IPC_MESSAGE_CONTROL3(AppCacheMsg_SelectCacheForWorker,
-                     int /* host_id */,
-                     int /* parent_process_id */,
-                     int /* parent_host_id */)
-IPC_MESSAGE_CONTROL2(AppCacheMsg_SelectCacheForSharedWorker,
-                     int /* host_id */,
-                     int64 /* appcache_id */)
-
-// Informs the browser of a 'foreign' entry in an appcache.
-IPC_MESSAGE_CONTROL3(AppCacheMsg_MarkAsForeignEntry,
-                     int /* host_id */,
-                     GURL  /* document_url */,
-                     int64 /* appcache_document_was_loaded_from */)
-
-// Returns the status of the appcache associated with host_id.
-IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheMsg_GetStatus,
-                            int /* host_id */,
-                            appcache::Status)
-
-// Initiates an update of the appcache associated with host_id.
-IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheMsg_StartUpdate,
-                            int /* host_id */,
-                            bool /* success */)
-
-// Swaps a new pending appcache, if there is one, into use for host_id.
-IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheMsg_SwapCache,
-                            int /* host_id */,
-                            bool /* success */)
-
-// Gets resource list from appcache synchronously.
-IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheMsg_GetResourceList,
-                            int /* host_id in*/,
-                            std::vector<appcache::AppCacheResourceInfo>
-                            /* resources out */)
-
 // Get the list of proxies to use for |url|, as a semicolon delimited list
 // of "<TYPE> <HOST>:<PORT>" | "DIRECT". See also
 // PluginProcessHostMsg_ResolveProxy which does the same thing.
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 7940718..cd8dc46 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -22,7 +22,6 @@
 #include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/dom_storage_messages.h"
@@ -34,7 +33,6 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/common/web_database_observer_impl.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/automation/dom_automation_v8_extension.h"
 #include "chrome/renderer/cookie_message_filter.h"
@@ -64,11 +62,13 @@
 #include "chrome/renderer/security_filter_peer.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/user_script_slave.h"
+#include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/database_messages.h"
 #include "content/common/db_message_filter.h"
 #include "content/common/gpu_messages.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
+#include "content/common/web_database_observer_impl.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a4789ee..070a1ee 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -22,7 +22,6 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/child_process_logging.h"
@@ -100,6 +99,7 @@
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "chrome/renderer/websharedworker_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
+#include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/content_constants.h"
 #include "content/common/database_messages.h"
 #include "content/common/file_system/file_system_dispatcher.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 240f6d8..6f1c0ef1 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -11,7 +11,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_thread.h"
@@ -27,6 +26,7 @@
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/webblobregistry_impl.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc
index 2d5fd25..a1e09fa 100644
--- a/chrome/renderer/websharedworker_proxy.cc
+++ b/chrome/renderer/websharedworker_proxy.cc
@@ -5,7 +5,7 @@
 #include "chrome/renderer/websharedworker_proxy.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/common/webmessageportchannel_impl.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 
diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc
index ad4be32..a5b32c8 100644
--- a/chrome/renderer/webworker_base.cc
+++ b/chrome/renderer/webworker_base.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "content/common/child_thread.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc
index 346d05b..6a7a496 100644
--- a/chrome/renderer/webworker_proxy.cc
+++ b/chrome/renderer/webworker_proxy.cc
@@ -5,8 +5,8 @@
 #include "chrome/renderer/webworker_proxy.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "content/common/child_thread.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc
index 4d3dd04..4599a77 100644
--- a/chrome/worker/websharedworker_stub.cc
+++ b/chrome/worker/websharedworker_stub.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/worker/websharedworker_stub.h"
 
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc
index b481bab..8d7a75f 100644
--- a/chrome/worker/webworker_stub.cc
+++ b/chrome/worker/webworker_stub.cc
@@ -5,9 +5,9 @@
 #include "chrome/worker/webworker_stub.h"
 
 #include "base/command_line.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 9bb23ba..951c2a4 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -6,13 +6,13 @@
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/worker/webworker_stub_base.h"
 #include "chrome/worker/worker_thread.h"
 #include "chrome/worker/worker_webapplicationcachehost_impl.h"
 #include "content/common/content_switches.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the
 // renderer worker code moves to content. This code isn't used now since we
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc
index 885c750..5c50f7c 100644
--- a/chrome/worker/worker_thread.cc
+++ b/chrome/worker/worker_thread.cc
@@ -7,13 +7,13 @@
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
-#include "chrome/common/appcache/appcache_dispatcher.h"
-#include "chrome/common/web_database_observer_impl.h"
 #include "chrome/worker/webworker_stub.h"
 #include "chrome/worker/websharedworker_stub.h"
 #include "chrome/worker/worker_webkitclient_impl.h"
+#include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/content_switches.h"
 #include "content/common/db_message_filter.h"
+#include "content/common/web_database_observer_impl.h"
 #include "content/common/worker_messages.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
diff --git a/chrome/worker/worker_webapplicationcachehost_impl.cc b/chrome/worker/worker_webapplicationcachehost_impl.cc
index fc0d282..0f63a1f 100644
--- a/chrome/worker/worker_webapplicationcachehost_impl.cc
+++ b/chrome/worker/worker_webapplicationcachehost_impl.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/worker/worker_webapplicationcachehost_impl.h"
 
-#include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/worker/worker_thread.h"
+#include "content/common/appcache/appcache_dispatcher.h"
 
 WorkerWebApplicationCacheHostImpl::WorkerWebApplicationCacheHostImpl(
     const WorkerAppCacheInitInfo& init_info,
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 261d049..3bb6ff1 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -6,15 +6,13 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
-#include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/worker/worker_thread.h"
 #include "content/common/database_util.h"
 #include "content/common/file_system/webfilesystem_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/webblobregistry_impl.h"
+#include "content/common/webmessageportchannel_impl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc
index 6d0246b..e3f4430 100644
--- a/content/browser/appcache/appcache_dispatcher_host.cc
+++ b/content/browser/appcache/appcache_dispatcher_host.cc
@@ -8,8 +8,8 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/common/render_messages.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/common/appcache_messages.h"
 
 AppCacheDispatcherHost::AppCacheDispatcherHost(
     net::URLRequestContext* request_context,
@@ -61,18 +61,19 @@ bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& message,
                                                bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(AppCacheDispatcherHost, message, *message_was_ok)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_RegisterHost, OnRegisterHost)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_UnregisterHost, OnUnregisterHost)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_GetResourceList, OnGetResourceList)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_SelectCache, OnSelectCache)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_SelectCacheForWorker,
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_RegisterHost, OnRegisterHost)
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_UnregisterHost, OnUnregisterHost)
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_GetResourceList, OnGetResourceList)
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_SelectCache, OnSelectCache)
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_SelectCacheForWorker,
                         OnSelectCacheForWorker)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_SelectCacheForSharedWorker,
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_SelectCacheForSharedWorker,
                         OnSelectCacheForSharedWorker)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_MarkAsForeignEntry, OnMarkAsForeignEntry)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheMsg_GetStatus, OnGetStatus)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheMsg_StartUpdate, OnStartUpdate)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheMsg_SwapCache, OnSwapCache)
+    IPC_MESSAGE_HANDLER(AppCacheHostMsg_MarkAsForeignEntry,
+                        OnMarkAsForeignEntry)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheHostMsg_GetStatus, OnGetStatus)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheHostMsg_StartUpdate, OnStartUpdate)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheHostMsg_SwapCache, OnSwapCache)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
@@ -218,20 +219,20 @@ void AppCacheDispatcherHost::GetStatusCallback(
     appcache::Status status, void* param) {
   IPC::Message* reply_msg = reinterpret_cast<IPC::Message*>(param);
   DCHECK_EQ(pending_reply_msg_.get(), reply_msg);
-  AppCacheMsg_GetStatus::WriteReplyParams(reply_msg, status);
+  AppCacheHostMsg_GetStatus::WriteReplyParams(reply_msg, status);
   Send(pending_reply_msg_.release());
 }
 
 void AppCacheDispatcherHost::StartUpdateCallback(bool result, void* param) {
   IPC::Message* reply_msg = reinterpret_cast<IPC::Message*>(param);
   DCHECK_EQ(pending_reply_msg_.get(), reply_msg);
-  AppCacheMsg_StartUpdate::WriteReplyParams(reply_msg, result);
+  AppCacheHostMsg_StartUpdate::WriteReplyParams(reply_msg, result);
   Send(pending_reply_msg_.release());
 }
 
 void AppCacheDispatcherHost::SwapCacheCallback(bool result, void* param) {
   IPC::Message* reply_msg = reinterpret_cast<IPC::Message*>(param);
   DCHECK_EQ(pending_reply_msg_.get(), reply_msg);
-  AppCacheMsg_SwapCache::WriteReplyParams(reply_msg, result);
+  AppCacheHostMsg_SwapCache::WriteReplyParams(reply_msg, result);
   Send(pending_reply_msg_.release());
 }
diff --git a/content/browser/appcache/appcache_frontend_proxy.cc b/content/browser/appcache/appcache_frontend_proxy.cc
index 3691007a..f6fa108 100644
--- a/content/browser/appcache/appcache_frontend_proxy.cc
+++ b/content/browser/appcache/appcache_frontend_proxy.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/appcache/appcache_frontend_proxy.h"
 
-#include "chrome/common/render_messages.h"
+#include "content/common/appcache_messages.h"
 
 AppCacheFrontendProxy::AppCacheFrontendProxy(IPC::Message::Sender* sender)
     : sender_(sender) {
diff --git a/chrome/common/appcache/appcache_backend_proxy.cc b/content/common/appcache/appcache_backend_proxy.cc
index 16e0ff4..be54b76 100644
--- a/chrome/common/appcache/appcache_backend_proxy.cc
+++ b/content/common/appcache/appcache_backend_proxy.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/appcache/appcache_backend_proxy.h"
+#include "content/common/appcache/appcache_backend_proxy.h"
 
-#include "chrome/common/render_messages.h"
+#include "content/common/appcache_messages.h"
 
 void AppCacheBackendProxy::RegisterHost(int host_id) {
-  sender_->Send(new AppCacheMsg_RegisterHost(host_id));
+  sender_->Send(new AppCacheHostMsg_RegisterHost(host_id));
 }
 
 void AppCacheBackendProxy::UnregisterHost(int host_id) {
-  sender_->Send(new AppCacheMsg_UnregisterHost(host_id));
+  sender_->Send(new AppCacheHostMsg_UnregisterHost(host_id));
 }
 
 void AppCacheBackendProxy::SelectCache(
@@ -19,7 +19,7 @@ void AppCacheBackendProxy::SelectCache(
     const GURL& document_url,
     const int64 cache_document_was_loaded_from,
     const GURL& manifest_url) {
-  sender_->Send(new AppCacheMsg_SelectCache(
+  sender_->Send(new AppCacheHostMsg_SelectCache(
                                     host_id, document_url,
                                     cache_document_was_loaded_from,
                                     manifest_url));
@@ -27,44 +27,44 @@ void AppCacheBackendProxy::SelectCache(
 
 void AppCacheBackendProxy::SelectCacheForWorker(
     int host_id, int parent_process_id, int parent_host_id) {
-  sender_->Send(new AppCacheMsg_SelectCacheForWorker(
+  sender_->Send(new AppCacheHostMsg_SelectCacheForWorker(
                                     host_id, parent_process_id,
                                     parent_host_id));
 }
 
 void AppCacheBackendProxy::SelectCacheForSharedWorker(
     int host_id, int64 appcache_id) {
-  sender_->Send(new AppCacheMsg_SelectCacheForSharedWorker(
+  sender_->Send(new AppCacheHostMsg_SelectCacheForSharedWorker(
                                     host_id, appcache_id));
 }
 
 void AppCacheBackendProxy::MarkAsForeignEntry(
     int host_id, const GURL& document_url,
     int64 cache_document_was_loaded_from) {
-  sender_->Send(new AppCacheMsg_MarkAsForeignEntry(
+  sender_->Send(new AppCacheHostMsg_MarkAsForeignEntry(
                                     host_id, document_url,
                                     cache_document_was_loaded_from));
 }
 
 appcache::Status AppCacheBackendProxy::GetStatus(int host_id) {
   appcache::Status status = appcache::UNCACHED;
-  sender_->Send(new AppCacheMsg_GetStatus(host_id, &status));
+  sender_->Send(new AppCacheHostMsg_GetStatus(host_id, &status));
   return status;
 }
 
 bool AppCacheBackendProxy::StartUpdate(int host_id) {
   bool result = false;
-  sender_->Send(new AppCacheMsg_StartUpdate(host_id, &result));
+  sender_->Send(new AppCacheHostMsg_StartUpdate(host_id, &result));
   return result;
 }
 
 bool AppCacheBackendProxy::SwapCache(int host_id) {
   bool result = false;
-  sender_->Send(new AppCacheMsg_SwapCache(host_id, &result));
+  sender_->Send(new AppCacheHostMsg_SwapCache(host_id, &result));
   return result;
 }
 
 void AppCacheBackendProxy::GetResourceList(
     int host_id, std::vector<appcache::AppCacheResourceInfo>* resource_infos) {
-  sender_->Send(new AppCacheMsg_GetResourceList(host_id, resource_infos));
+  sender_->Send(new AppCacheHostMsg_GetResourceList(host_id, resource_infos));
 }
diff --git a/chrome/common/appcache/appcache_backend_proxy.h b/content/common/appcache/appcache_backend_proxy.h
index 8d9de2b..b05115e 100644
--- a/chrome/common/appcache/appcache_backend_proxy.h
+++ b/content/common/appcache/appcache_backend_proxy.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
-#define CHROME_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
+#ifndef CONTENT_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
+#define CONTENT_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
 #pragma once
 
 #include "ipc/ipc_message.h"
@@ -44,4 +44,4 @@ class AppCacheBackendProxy : public appcache::AppCacheBackend {
   IPC::Message::Sender* sender_;
 };
 
-#endif  // CHROME_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
+#endif  // CONTENT_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
diff --git a/chrome/common/appcache/appcache_dispatcher.cc b/content/common/appcache/appcache_dispatcher.cc
index b32b48e..6504770 100644
--- a/chrome/common/appcache/appcache_dispatcher.cc
+++ b/content/common/appcache/appcache_dispatcher.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/appcache/appcache_dispatcher.h"
+#include "content/common/appcache/appcache_dispatcher.h"
 
-#include "chrome/common/render_messages.h"
+#include "content/common/appcache_messages.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 
 bool AppCacheDispatcher::OnMessageReceived(const IPC::Message& msg) {
diff --git a/chrome/common/appcache/appcache_dispatcher.h b/content/common/appcache/appcache_dispatcher.h
index bec0d82..aafaa395 100644
--- a/chrome/common/appcache/appcache_dispatcher.h
+++ b/content/common/appcache/appcache_dispatcher.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
-#define CHROME_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
+#ifndef CONTENT_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
+#define CONTENT_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
-#include "chrome/common/appcache/appcache_backend_proxy.h"
+#include "content/common/appcache/appcache_backend_proxy.h"
 #include "ipc/ipc_channel.h"
 #include "webkit/appcache/appcache_frontend_impl.h"
 
@@ -45,4 +45,4 @@ class AppCacheDispatcher : public IPC::Channel::Listener {
   appcache::AppCacheFrontendImpl frontend_impl_;
 };
 
-#endif  // CHROME_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
+#endif  // CONTENT_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
diff --git a/content/common/appcache_messages.h b/content/common/appcache_messages.h
new file mode 100644
index 0000000..d14ffa8
--- /dev/null
+++ b/content/common/appcache_messages.h
@@ -0,0 +1,137 @@
+// 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.
+
+// Multiply-included message file, hence no include guard.
+
+#include "ipc/ipc_message_macros.h"
+#include "webkit/appcache/appcache_interfaces.h"
+
+#define IPC_MESSAGE_START AppCacheMsgStart
+
+IPC_ENUM_TRAITS(appcache::EventID)
+IPC_ENUM_TRAITS(appcache::Status)
+
+IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheInfo)
+  IPC_STRUCT_TRAITS_MEMBER(manifest_url)
+  IPC_STRUCT_TRAITS_MEMBER(creation_time)
+  IPC_STRUCT_TRAITS_MEMBER(last_update_time)
+  IPC_STRUCT_TRAITS_MEMBER(last_access_time)
+  IPC_STRUCT_TRAITS_MEMBER(cache_id)
+  IPC_STRUCT_TRAITS_MEMBER(status)
+  IPC_STRUCT_TRAITS_MEMBER(size)
+  IPC_STRUCT_TRAITS_MEMBER(is_complete)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(appcache::AppCacheResourceInfo)
+  IPC_STRUCT_TRAITS_MEMBER(url)
+  IPC_STRUCT_TRAITS_MEMBER(size)
+  IPC_STRUCT_TRAITS_MEMBER(is_master)
+  IPC_STRUCT_TRAITS_MEMBER(is_manifest)
+  IPC_STRUCT_TRAITS_MEMBER(is_fallback)
+  IPC_STRUCT_TRAITS_MEMBER(is_foreign)
+  IPC_STRUCT_TRAITS_MEMBER(is_explicit)
+IPC_STRUCT_TRAITS_END()
+
+// AppCache messages sent from the child process to the browser.
+
+// Informs the browser of a new appcache host.
+IPC_MESSAGE_CONTROL1(AppCacheHostMsg_RegisterHost,
+                     int /* host_id */)
+
+// Informs the browser of an appcache host being destroyed.
+IPC_MESSAGE_CONTROL1(AppCacheHostMsg_UnregisterHost,
+                     int /* host_id */)
+
+// Initiates the cache selection algorithm for the given host.
+// This is sent prior to any subresource loads. An AppCacheMsg_CacheSelected
+// message will be sent in response.
+// 'host_id' indentifies a specific document or worker
+// 'document_url' the url of the main resource
+// 'appcache_document_was_loaded_from' the id of the appcache the main
+//     resource was loaded from or kNoCacheId
+// 'opt_manifest_url' the manifest url specified in the <html> tag if any
+IPC_MESSAGE_CONTROL4(AppCacheHostMsg_SelectCache,
+                     int /* host_id */,
+                     GURL  /* document_url */,
+                     int64 /* appcache_document_was_loaded_from */,
+                     GURL  /* opt_manifest_url */)
+
+// Initiates worker specific cache selection algorithm for the given host.
+IPC_MESSAGE_CONTROL3(AppCacheHostMsg_SelectCacheForWorker,
+                     int /* host_id */,
+                     int /* parent_process_id */,
+                     int /* parent_host_id */)
+IPC_MESSAGE_CONTROL2(AppCacheHostMsg_SelectCacheForSharedWorker,
+                     int /* host_id */,
+                     int64 /* appcache_id */)
+
+// Informs the browser of a 'foreign' entry in an appcache.
+IPC_MESSAGE_CONTROL3(AppCacheHostMsg_MarkAsForeignEntry,
+                     int /* host_id */,
+                     GURL  /* document_url */,
+                     int64 /* appcache_document_was_loaded_from */)
+
+// Returns the status of the appcache associated with host_id.
+IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_GetStatus,
+                            int /* host_id */,
+                            appcache::Status)
+
+// Initiates an update of the appcache associated with host_id.
+IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_StartUpdate,
+                            int /* host_id */,
+                            bool /* success */)
+
+// Swaps a new pending appcache, if there is one, into use for host_id.
+IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_SwapCache,
+                            int /* host_id */,
+                            bool /* success */)
+
+// Gets resource list from appcache synchronously.
+IPC_SYNC_MESSAGE_CONTROL1_1(AppCacheHostMsg_GetResourceList,
+                            int /* host_id in*/,
+                            std::vector<appcache::AppCacheResourceInfo>
+                            /* resources out */)
+
+
+// AppCache messages sent from the browser to the child process.
+
+// Notifies the renderer of the appcache that has been selected for a
+// a particular host. This is sent in reply to AppCacheHostMsg_SelectCache.
+IPC_MESSAGE_CONTROL2(AppCacheMsg_CacheSelected,
+                     int /* host_id */,
+                     appcache::AppCacheInfo)
+
+// Notifies the renderer of an AppCache status change.
+IPC_MESSAGE_CONTROL2(AppCacheMsg_StatusChanged,
+                     std::vector<int> /* host_ids */,
+                     appcache::Status)
+
+// Notifies the renderer of an AppCache event other than the
+// progress event which has a seperate message.
+IPC_MESSAGE_CONTROL2(AppCacheMsg_EventRaised,
+                     std::vector<int> /* host_ids */,
+                     appcache::EventID)
+
+// Notifies the renderer of an AppCache progress event.
+IPC_MESSAGE_CONTROL4(AppCacheMsg_ProgressEventRaised,
+                     std::vector<int> /* host_ids */,
+                     GURL /* url being processed */,
+                     int /* total */,
+                     int /* complete */)
+
+// Notifies the renderer of an AppCache error event.
+IPC_MESSAGE_CONTROL2(AppCacheMsg_ErrorEventRaised,
+                     std::vector<int> /* host_ids */,
+                     std::string /* error_message */)
+
+// Notifies the renderer of an AppCache logging message.
+IPC_MESSAGE_CONTROL3(AppCacheMsg_LogMessage,
+                     int /* host_id */,
+                     int /* log_level */,
+                     std::string /* message */)
+
+// Notifies the renderer of the fact that AppCache access was blocked.
+IPC_MESSAGE_CONTROL2(AppCacheMsg_ContentBlocked,
+                     int /* host_id */,
+                     GURL /* manifest_url */)
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 68c16e8..117865f 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -4,6 +4,7 @@
 
 // Multiply-included file, hence no include guard.
 
+#include "content/common/appcache_messages.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/database_messages.h"
 #include "content/common/file_system_messages.h"
diff --git a/chrome/common/web_database_observer_impl.cc b/content/common/web_database_observer_impl.cc
index a026838..37c3e2c 100644
--- a/chrome/common/web_database_observer_impl.cc
+++ b/content/common/web_database_observer_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/web_database_observer_impl.h"
+#include "content/common/web_database_observer_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/message_loop.h"
diff --git a/chrome/common/web_database_observer_impl.h b/content/common/web_database_observer_impl.h
index bb47472..442a7af 100644
--- a/chrome/common/web_database_observer_impl.h
+++ b/content/common/web_database_observer_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 CHROME_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
-#define CHROME_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
+#ifndef CONTENT_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
+#define CONTENT_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
 #pragma once
 
 #include "ipc/ipc_message.h"
@@ -26,4 +26,4 @@ class WebDatabaseObserverImpl : public WebKit::WebDatabaseObserver {
   webkit_database::DatabaseConnections database_connections_;
 };
 
-#endif  // CHROME_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
+#endif  // CONTENT_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
diff --git a/chrome/common/webmessageportchannel_impl.cc b/content/common/webmessageportchannel_impl.cc
index c734132..6a9ac36 100644
--- a/chrome/common/webmessageportchannel_impl.cc
+++ b/content/common/webmessageportchannel_impl.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/webmessageportchannel_impl.h"
+#include "content/common/webmessageportchannel_impl.h"
 
 #include "content/common/child_process.h"
 #include "content/common/child_thread.h"
diff --git a/chrome/common/webmessageportchannel_impl.h b/content/common/webmessageportchannel_impl.h
index 846a546..e947050 100644
--- a/chrome/common/webmessageportchannel_impl.h
+++ b/content/common/webmessageportchannel_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
-#define CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#ifndef CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#define CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
 #pragma once
 
 #include <queue>
@@ -75,4 +75,4 @@ class WebMessagePortChannelImpl
   DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl);
 };
 
-#endif  // CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#endif  // CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 326bfcc..56e25c7 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -11,6 +11,7 @@
         '../ipc/ipc.gyp:ipc',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:fileapi',
       ],
@@ -18,6 +19,11 @@
         '..',
       ],
       'sources': [
+        'common/appcache/appcache_backend_proxy.cc',
+        'common/appcache/appcache_backend_proxy.h',
+        'common/appcache/appcache_dispatcher.cc',
+        'common/appcache/appcache_dispatcher.h',
+        'common/appcache_messages.h',
         'common/child_process.cc',
         'common/child_process.h',
         'common/child_process_host.cc',
@@ -103,9 +109,6 @@
         'common/socket_stream_dispatcher.cc',
         'common/socket_stream_dispatcher.h',
         'common/socket_stream_messages.h',
-        'common/webblobregistry_impl.cc',
-        'common/webblobregistry_impl.h',
-        'common/webblob_messages.h',
         'common/worker_messages.h',
       ],
       'conditions': [
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 07db0ee..79a7bc1 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -76,6 +76,7 @@ enum IPCMessageStart {
   ChildProcessMsgStart,
   ClipboardMsgStart,
   BlobMsgStart,
+  AppCacheMsgStart,
 };
 
 class DictionaryValue;