Move AppCache common code to content and split off AppCache messages into the...

chrome/common/render_messages.h

Index: chrome/common/render_messages.h
===================================================================
--- chrome/common/render_messages.h	(revision 77976)
+++ chrome/common/render_messages.h	(working copy)
@@ -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/blob/blob_data.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/webaccessibility.h"
@@ -227,98 +226,6 @@
 
 #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;
@@ -377,24 +284,7 @@
   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;
   static void Write(Message* m, const param_type& p);
@@ -960,46 +850,6 @@
 // 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.
@@ -2097,64 +1947,6 @@
                            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.