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

23 files changed, 15 insertions, 950 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/appcache/appcache_backend_proxy.cc b/chrome/common/appcache/appcache_backend_proxy.cc
deleted file mode 100644
index 16e0ff4..0000000
--- a/chrome/common/appcache/appcache_backend_proxy.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2009 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 "chrome/common/render_messages.h"
-
-void AppCacheBackendProxy::RegisterHost(int host_id) {
-  sender_->Send(new AppCacheMsg_RegisterHost(host_id));
-}
-
-void AppCacheBackendProxy::UnregisterHost(int host_id) {
-  sender_->Send(new AppCacheMsg_UnregisterHost(host_id));
-}
-
-void AppCacheBackendProxy::SelectCache(
-    int host_id,
-    const GURL& document_url,
-    const int64 cache_document_was_loaded_from,
-    const GURL& manifest_url) {
-  sender_->Send(new AppCacheMsg_SelectCache(
-                                    host_id, document_url,
-                                    cache_document_was_loaded_from,
-                                    manifest_url));
-}
-
-void AppCacheBackendProxy::SelectCacheForWorker(
-    int host_id, int parent_process_id, int parent_host_id) {
-  sender_->Send(new AppCacheMsg_SelectCacheForWorker(
-                                    host_id, parent_process_id,
-                                    parent_host_id));
-}
-
-void AppCacheBackendProxy::SelectCacheForSharedWorker(
-    int host_id, int64 appcache_id) {
-  sender_->Send(new AppCacheMsg_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(
-                                    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));
-  return status;
-}
-
-bool AppCacheBackendProxy::StartUpdate(int host_id) {
-  bool result = false;
-  sender_->Send(new AppCacheMsg_StartUpdate(host_id, &result));
-  return result;
-}
-
-bool AppCacheBackendProxy::SwapCache(int host_id) {
-  bool result = false;
-  sender_->Send(new AppCacheMsg_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));
-}
diff --git a/chrome/common/appcache/appcache_backend_proxy.h b/chrome/common/appcache/appcache_backend_proxy.h
deleted file mode 100644
index 8d9de2b..0000000
--- a/chrome/common/appcache/appcache_backend_proxy.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2009 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_
-#pragma once
-
-#include "ipc/ipc_message.h"
-#include "webkit/appcache/appcache_interfaces.h"
-
-// Sends appcache related messages to the main process.
-class AppCacheBackendProxy : public appcache::AppCacheBackend {
- public:
-  explicit AppCacheBackendProxy(IPC::Message::Sender* sender)
-      : sender_(sender) {}
-
-  IPC::Message::Sender* sender() const { return sender_; }
-
-  // AppCacheBackend methods
-  virtual void RegisterHost(int host_id);
-  virtual void UnregisterHost(int host_id);
-  virtual void SelectCache(int host_id,
-                           const GURL& document_url,
-                           const int64 cache_document_was_loaded_from,
-                           const GURL& manifest_url);
-  virtual void SelectCacheForWorker(
-                           int host_id,
-                           int parent_process_id,
-                           int parent_host_id);
-  virtual void SelectCacheForSharedWorker(
-                           int host_id,
-                           int64 appcache_id);
-  virtual void MarkAsForeignEntry(int host_id, const GURL& document_url,
-                                  int64 cache_document_was_loaded_from);
-  virtual appcache::Status GetStatus(int host_id);
-  virtual bool StartUpdate(int host_id);
-  virtual bool SwapCache(int host_id);
-  virtual void GetResourceList(
-      int host_id,
-      std::vector<appcache::AppCacheResourceInfo>* resource_infos);
-
- private:
-  IPC::Message::Sender* sender_;
-};
-
-#endif  // CHROME_COMMON_APPCACHE_APPCACHE_BACKEND_PROXY_H_
diff --git a/chrome/common/appcache/appcache_dispatcher.cc b/chrome/common/appcache/appcache_dispatcher.cc
deleted file mode 100644
index b32b48e..0000000
--- a/chrome/common/appcache/appcache_dispatcher.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2010 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 "chrome/common/render_messages.h"
-#include "webkit/appcache/web_application_cache_host_impl.h"
-
-bool AppCacheDispatcher::OnMessageReceived(const IPC::Message& msg) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AppCacheDispatcher, msg)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_CacheSelected, OnCacheSelected)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_StatusChanged, OnStatusChanged)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_EventRaised, OnEventRaised)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_ProgressEventRaised, OnProgressEventRaised)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_ErrorEventRaised, OnErrorEventRaised)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_LogMessage, OnLogMessage)
-    IPC_MESSAGE_HANDLER(AppCacheMsg_ContentBlocked, OnContentBlocked)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void AppCacheDispatcher::OnCacheSelected(
-    int host_id, const appcache::AppCacheInfo& info) {
-  frontend_impl_.OnCacheSelected(host_id, info);
-}
-
-void AppCacheDispatcher::OnStatusChanged(const std::vector<int>& host_ids,
-                                         appcache::Status status) {
-  frontend_impl_.OnStatusChanged(host_ids, status);
-}
-
-void AppCacheDispatcher::OnEventRaised(const std::vector<int>& host_ids,
-                                       appcache::EventID event_id) {
-  frontend_impl_.OnEventRaised(host_ids, event_id);
-}
-
-void AppCacheDispatcher::OnProgressEventRaised(
-    const std::vector<int>& host_ids,
-    const GURL& url, int num_total, int num_complete) {
-  frontend_impl_.OnProgressEventRaised(host_ids, url, num_total, num_complete);
-}
-
-void AppCacheDispatcher::OnErrorEventRaised(
-    const std::vector<int>& host_ids,
-    const std::string& message) {
-  frontend_impl_.OnErrorEventRaised(host_ids, message);
-}
-
-void AppCacheDispatcher::OnLogMessage(
-    int host_id, int log_level, const std::string& message) {
-  frontend_impl_.OnLogMessage(
-      host_id, static_cast<appcache::LogLevel>(log_level), message);
-}
-
-void AppCacheDispatcher::OnContentBlocked(int host_id,
-                                          const GURL& manifest_url) {
-  frontend_impl_.OnContentBlocked(host_id, manifest_url);
-}
diff --git a/chrome/common/appcache/appcache_dispatcher.h b/chrome/common/appcache/appcache_dispatcher.h
deleted file mode 100644
index bec0d82..0000000
--- a/chrome/common/appcache/appcache_dispatcher.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2010 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_
-#pragma once
-
-#include <string>
-#include <vector>
-#include "chrome/common/appcache/appcache_backend_proxy.h"
-#include "ipc/ipc_channel.h"
-#include "webkit/appcache/appcache_frontend_impl.h"
-
-// Dispatches appcache related messages sent to a child process from the
-// main browser process. There is one instance per child process. Messages
-// are dispatched on the main child thread. The ChildThread base class
-// creates an instance and delegates calls to it.
-class AppCacheDispatcher : public IPC::Channel::Listener {
- public:
-  explicit AppCacheDispatcher(IPC::Message::Sender* sender)
-      : backend_proxy_(sender) {}
-
-  AppCacheBackendProxy* backend_proxy() { return &backend_proxy_; }
-
-  // IPC::Channel::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& msg);
-
- private:
-  // Ipc message handlers
-  void OnCacheSelected(int host_id, const appcache::AppCacheInfo& info);
-  void OnStatusChanged(const std::vector<int>& host_ids,
-                       appcache::Status status);
-  void OnEventRaised(const std::vector<int>& host_ids,
-                     appcache::EventID event_id);
-  void OnProgressEventRaised(const std::vector<int>& host_ids,
-                             const GURL& url, int num_total, int num_complete);
-  void OnErrorEventRaised(const std::vector<int>& host_ids,
-                          const std::string& message);
-  void OnLogMessage(int host_id, int log_level, const std::string& message);
-  void OnContentBlocked(int host_id,
-                        const GURL& manifest_url);
-
-  AppCacheBackendProxy backend_proxy_;
-  appcache::AppCacheFrontendImpl frontend_impl_;
-};
-
-#endif  // CHROME_COMMON_APPCACHE_APPCACHE_DISPATCHER_H_
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/common/web_database_observer_impl.cc b/chrome/common/web_database_observer_impl.cc
deleted file mode 100644
index a026838..0000000
--- a/chrome/common/web_database_observer_impl.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2010 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 "base/auto_reset.h"
-#include "base/message_loop.h"
-#include "base/string16.h"
-#include "content/common/database_messages.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-
-WebDatabaseObserverImpl::WebDatabaseObserverImpl(
-    IPC::Message::Sender* sender)
-    : sender_(sender),
-      waiting_for_dbs_to_close_(false) {
-}
-
-void WebDatabaseObserverImpl::databaseOpened(
-    const WebKit::WebDatabase& database) {
-  string16 origin_identifier = database.securityOrigin().databaseIdentifier();
-  string16 database_name = database.name();
-  sender_->Send(new DatabaseHostMsg_Opened(
-      origin_identifier, database_name,
-      database.displayName(), database.estimatedSize()));
-  database_connections_.AddConnection(origin_identifier, database_name);
-}
-
-void WebDatabaseObserverImpl::databaseModified(
-    const WebKit::WebDatabase& database) {
-  sender_->Send(new DatabaseHostMsg_Modified(
-      database.securityOrigin().databaseIdentifier(), database.name()));
-}
-
-void WebDatabaseObserverImpl::databaseClosed(
-    const WebKit::WebDatabase& database) {
-  string16 origin_identifier = database.securityOrigin().databaseIdentifier();
-  string16 database_name = database.name();
-  sender_->Send(new DatabaseHostMsg_Closed(
-      origin_identifier, database_name));
-  database_connections_.RemoveConnection(origin_identifier, database_name);
-  if (waiting_for_dbs_to_close_ && database_connections_.IsEmpty())
-    MessageLoop::current()->Quit();
-}
-
-void WebDatabaseObserverImpl::WaitForAllDatabasesToClose() {
-  if (!database_connections_.IsEmpty()) {
-    AutoReset<bool> waiting_for_dbs_auto_reset(&waiting_for_dbs_to_close_, true);
-    MessageLoop::ScopedNestableTaskAllower nestable(MessageLoop::current());
-    MessageLoop::current()->Run();
-  }
-}
diff --git a/chrome/common/web_database_observer_impl.h b/chrome/common/web_database_observer_impl.h
deleted file mode 100644
index bb47472..0000000
--- a/chrome/common/web_database_observer_impl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2010 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_WEB_DATABASE_OBSERVER_IMPL_H_
-#define CHROME_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
-#pragma once
-
-#include "ipc/ipc_message.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h"
-#include "webkit/database/database_connections.h"
-
-class WebDatabaseObserverImpl : public WebKit::WebDatabaseObserver {
- public:
-  explicit WebDatabaseObserverImpl(IPC::Message::Sender* sender);
-  virtual ~WebDatabaseObserverImpl() {}
-  virtual void databaseOpened(const WebKit::WebDatabase& database);
-  virtual void databaseModified(const WebKit::WebDatabase& database);
-  virtual void databaseClosed(const WebKit::WebDatabase& database);
-
-  void WaitForAllDatabasesToClose();
-
- private:
-  IPC::Message::Sender* sender_;
-  bool waiting_for_dbs_to_close_;
-  webkit_database::DatabaseConnections database_connections_;
-};
-
-#endif  // CHROME_COMMON_WEB_DATABASE_OBSERVER_IMPL_H_
diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc
deleted file mode 100644
index c734132..0000000
--- a/chrome/common/webmessageportchannel_impl.cc
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) 2009 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/child_process.h"
-#include "content/common/child_thread.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/WebMessagePortChannelClient.h"
-
-using WebKit::WebMessagePortChannel;
-using WebKit::WebMessagePortChannelArray;
-using WebKit::WebMessagePortChannelClient;
-using WebKit::WebString;
-
-WebMessagePortChannelImpl::WebMessagePortChannelImpl()
-    : client_(NULL),
-      route_id_(MSG_ROUTING_NONE),
-      message_port_id_(MSG_ROUTING_NONE) {
-  AddRef();
-  Init();
-}
-
-WebMessagePortChannelImpl::WebMessagePortChannelImpl(
-    int route_id,
-    int message_port_id)
-    : client_(NULL),
-      route_id_(route_id),
-      message_port_id_(message_port_id) {
-  AddRef();
-  Init();
-}
-
-WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
-  // If we have any queued messages with attached ports, manually destroy them.
-  while (!message_queue_.empty()) {
-    const std::vector<WebMessagePortChannelImpl*>& channel_array =
-        message_queue_.front().ports;
-    for (size_t i = 0; i < channel_array.size(); i++) {
-      channel_array[i]->destroy();
-    }
-    message_queue_.pop();
-  }
-
-  if (message_port_id_ != MSG_ROUTING_NONE)
-    Send(new WorkerProcessHostMsg_DestroyMessagePort(message_port_id_));
-
-  if (route_id_ != MSG_ROUTING_NONE)
-    ChildThread::current()->RemoveRoute(route_id_);
-}
-
-void WebMessagePortChannelImpl::setClient(WebMessagePortChannelClient* client) {
-  // Must lock here since client_ is called on the main thread.
-  base::AutoLock auto_lock(lock_);
-  client_ = client;
-}
-
-void WebMessagePortChannelImpl::destroy() {
-  setClient(NULL);
-
-  // Release the object on the main thread, since the destructor might want to
-  // send an IPC, and that has to happen on the main thread.
-  ChildThread::current()->message_loop()->ReleaseSoon(FROM_HERE, this);
-}
-
-void WebMessagePortChannelImpl::entangle(WebMessagePortChannel* channel) {
-  // The message port ids might not be set up yet, if this channel wasn't
-  // created on the main thread.  So need to wait until we're on the main thread
-  // before getting the other message port id.
-  scoped_refptr<WebMessagePortChannelImpl> webchannel(
-      static_cast<WebMessagePortChannelImpl*>(channel));
-  Entangle(webchannel);
-}
-
-void WebMessagePortChannelImpl::postMessage(
-    const WebString& message,
-    WebMessagePortChannelArray* channels) {
-  if (MessageLoop::current() != ChildThread::current()->message_loop()) {
-    ChildThread::current()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this, &WebMessagePortChannelImpl::postMessage,
-            message, channels));
-    return;
-  }
-
-  std::vector<int> message_port_ids(channels ? channels->size() : 0);
-  if (channels) {
-    // Extract the port IDs from the source array, then free it.
-    for (size_t i = 0; i < channels->size(); ++i) {
-      WebMessagePortChannelImpl* webchannel =
-          static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
-      message_port_ids[i] = webchannel->message_port_id();
-      webchannel->QueueMessages();
-      DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
-    }
-    delete channels;
-  }
-
-  IPC::Message* msg = new WorkerProcessHostMsg_PostMessage(
-      message_port_id_, message, message_port_ids);
-  Send(msg);
-}
-
-bool WebMessagePortChannelImpl::tryGetMessage(
-    WebString* message,
-    WebMessagePortChannelArray& channels) {
-  base::AutoLock auto_lock(lock_);
-  if (message_queue_.empty())
-    return false;
-
-  *message = message_queue_.front().message;
-  const std::vector<WebMessagePortChannelImpl*>& channel_array =
-      message_queue_.front().ports;
-  WebMessagePortChannelArray result_ports(channel_array.size());
-  for (size_t i = 0; i < channel_array.size(); i++) {
-    result_ports[i] = channel_array[i];
-  }
-
-  channels.swap(result_ports);
-  message_queue_.pop();
-  return true;
-}
-
-void WebMessagePortChannelImpl::Init() {
-  if (MessageLoop::current() != ChildThread::current()->message_loop()) {
-    ChildThread::current()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this, &WebMessagePortChannelImpl::Init));
-    return;
-  }
-
-  if (route_id_ == MSG_ROUTING_NONE) {
-    DCHECK(message_port_id_ == MSG_ROUTING_NONE);
-    Send(new WorkerProcessHostMsg_CreateMessagePort(
-        &route_id_, &message_port_id_));
-  }
-
-  ChildThread::current()->AddRoute(route_id_, this);
-}
-
-void WebMessagePortChannelImpl::Entangle(
-    scoped_refptr<WebMessagePortChannelImpl> channel) {
-  if (MessageLoop::current() != ChildThread::current()->message_loop()) {
-    ChildThread::current()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this, &WebMessagePortChannelImpl::Entangle, channel));
-    return;
-  }
-
-  Send(new WorkerProcessHostMsg_Entangle(
-      message_port_id_, channel->message_port_id()));
-}
-
-void WebMessagePortChannelImpl::QueueMessages() {
-  if (MessageLoop::current() != ChildThread::current()->message_loop()) {
-    ChildThread::current()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this, &WebMessagePortChannelImpl::QueueMessages));
-    return;
-  }
-  // This message port is being sent elsewhere (perhaps to another process).
-  // The new endpoint needs to receive the queued messages, including ones that
-  // could still be in-flight.  So we tell the browser to queue messages, and it
-  // sends us an ack, whose receipt we know means that no more messages are
-  // in-flight.  We then send the queued messages to the browser, which prepends
-  // them to the ones it queued and it sends them to the new endpoint.
-  Send(new WorkerProcessHostMsg_QueueMessages(message_port_id_));
-
-  // The process could potentially go away while we're still waiting for
-  // in-flight messages.  Ensure it stays alive.
-  ChildProcess::current()->AddRefProcess();
-}
-
-void WebMessagePortChannelImpl::Send(IPC::Message* message) {
-  if (MessageLoop::current() != ChildThread::current()->message_loop()) {
-    DCHECK(!message->is_sync());
-    ChildThread::current()->message_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(this, &WebMessagePortChannelImpl::Send, message));
-    return;
-  }
-
-  ChildThread::current()->Send(message);
-}
-
-bool WebMessagePortChannelImpl::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(WebMessagePortChannelImpl, message)
-    IPC_MESSAGE_HANDLER(WorkerProcessMsg_Message, OnMessage)
-    IPC_MESSAGE_HANDLER(WorkerProcessMsg_MessagesQueued, OnMessagedQueued)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void WebMessagePortChannelImpl::OnMessage(
-    const string16& message,
-    const std::vector<int>& sent_message_port_ids,
-    const std::vector<int>& new_routing_ids) {
-  base::AutoLock auto_lock(lock_);
-  Message msg;
-  msg.message = message;
-  if (!sent_message_port_ids.empty()) {
-    msg.ports.resize(sent_message_port_ids.size());
-    for (size_t i = 0; i < sent_message_port_ids.size(); ++i) {
-      msg.ports[i] = new WebMessagePortChannelImpl(
-          new_routing_ids[i], sent_message_port_ids[i]);
-    }
-  }
-
-  bool was_empty = message_queue_.empty();
-  message_queue_.push(msg);
-  if (client_ && was_empty)
-    client_->messageAvailable();
-}
-
-void WebMessagePortChannelImpl::OnMessagedQueued() {
-  std::vector<QueuedMessage> queued_messages;
-
-  {
-    base::AutoLock auto_lock(lock_);
-    queued_messages.reserve(message_queue_.size());
-    while (!message_queue_.empty()) {
-      string16 message = message_queue_.front().message;
-      const std::vector<WebMessagePortChannelImpl*>& channel_array =
-          message_queue_.front().ports;
-      std::vector<int> port_ids(channel_array.size());
-      for (size_t i = 0; i < channel_array.size(); ++i) {
-        port_ids[i] = channel_array[i]->message_port_id();
-      }
-      queued_messages.push_back(std::make_pair(message, port_ids));
-      message_queue_.pop();
-    }
-  }
-
-  Send(new WorkerProcessHostMsg_SendQueuedMessages(
-      message_port_id_, queued_messages));
-
-  message_port_id_ = MSG_ROUTING_NONE;
-
-  Release();
-  ChildProcess::current()->ReleaseProcess();
-}
-
-WebMessagePortChannelImpl::Message::Message() {}
-
-WebMessagePortChannelImpl::Message::~Message() {}
diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h
deleted file mode 100644
index 846a546..0000000
--- a/chrome/common/webmessageportchannel_impl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2009 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_
-#pragma once
-
-#include <queue>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/string16.h"
-#include "base/ref_counted.h"
-#include "base/synchronization/lock.h"
-#include "ipc/ipc_channel.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannel.h"
-
-// This is thread safe.
-class WebMessagePortChannelImpl
-    : public WebKit::WebMessagePortChannel,
-      public IPC::Channel::Listener,
-      public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
- public:
-  WebMessagePortChannelImpl();
-  WebMessagePortChannelImpl(int route_id, int message_port_id);
-
-  // Queues received and incoming messages until there are no more in-flight
-  // messages, then sends all of them to the browser process.
-  void QueueMessages();
-  int message_port_id() const { return message_port_id_; }
-
- private:
-  friend class base::RefCountedThreadSafe<WebMessagePortChannelImpl>;
-  virtual ~WebMessagePortChannelImpl();
-
-  // WebMessagePortChannel implementation.
-  virtual void setClient(WebKit::WebMessagePortChannelClient* client);
-  virtual void destroy();
-  virtual void entangle(WebKit::WebMessagePortChannel* channel);
-  virtual void postMessage(const WebKit::WebString& message,
-                           WebKit::WebMessagePortChannelArray* channels);
-  virtual bool tryGetMessage(WebKit::WebString* message,
-                             WebKit::WebMessagePortChannelArray& channels);
-
-  void Init();
-  void Entangle(scoped_refptr<WebMessagePortChannelImpl> channel);
-  void Send(IPC::Message* message);
-
-  // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-
-  void OnMessage(const string16& message,
-                 const std::vector<int>& sent_message_port_ids,
-                 const std::vector<int>& new_routing_ids);
-  void OnMessagedQueued();
-
-  struct Message {
-    Message();
-    ~Message();
-
-    string16 message;
-    std::vector<WebMessagePortChannelImpl*> ports;
-  };
-
-  typedef std::queue<Message> MessageQueue;
-  MessageQueue message_queue_;
-
-  WebKit::WebMessagePortChannelClient* client_;
-  base::Lock lock_;  // Locks access to above.
-
-  int route_id_;  // The routing id for this object.
-  int message_port_id_;  // A globally unique identifier for this message port.
-
-  DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl);
-};
-
-#endif  // CHROME_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
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"