Port messages sent by WebIDBCursorImpl to Mojo.

content/common/indexed_db/indexed_db_messages.h

Index: content/common/indexed_db/indexed_db_messages.h
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h
index f1c1b9ab9eca846a1fc89dc04a0a3d7b81feeb90..b9f00206ff1d10310624d238f538158394a19654 100644
--- a/content/common/indexed_db/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -50,54 +50,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal)
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBOperationType,
                           blink::WebIDBOperationTypeLast)
 
-IPC_STRUCT_BEGIN(IndexedDBMsg_BlobOrFileInfo)
-IPC_STRUCT_MEMBER(bool, is_file)
-IPC_STRUCT_MEMBER(std::string, uuid)
-IPC_STRUCT_MEMBER(base::string16, mime_type)
-IPC_STRUCT_MEMBER(uint64_t, size)
-IPC_STRUCT_MEMBER(base::string16, file_path)
-IPC_STRUCT_MEMBER(base::string16, file_name)
-IPC_STRUCT_MEMBER(double, last_modified)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBMsg_Value)
-  // The serialized value being transferred.
-  IPC_STRUCT_MEMBER(std::string, bits)
-  // Sideband data for any blob or file encoded in value.
-  IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_BlobOrFileInfo>, blob_or_file_info)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN_WITH_PARENT(IndexedDBMsg_ReturnValue, IndexedDBMsg_Value)
-  IPC_STRUCT_TRAITS_PARENT(IndexedDBMsg_Value)
-  // Optional primary key & path used only when key generator specified.
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorContinue_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_cursor_id)
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, key)
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  IPC_STRUCT_MEMBER(IndexedDBMsg_Value, value)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_cursor_id)
-  IPC_STRUCT_MEMBER(std::vector<content::IndexedDBKey>, keys)
-  IPC_STRUCT_MEMBER(std::vector<content::IndexedDBKey>, primary_keys)
-  IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_Value>, values)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessValue_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  IPC_STRUCT_MEMBER(IndexedDBMsg_ReturnValue, value)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(IndexedDBMsg_Observation)
   IPC_STRUCT_MEMBER(int64_t, object_store_id)
   IPC_STRUCT_MEMBER(blink::WebIDBOperationType, type)
@@ -115,67 +67,7 @@ IPC_STRUCT_END()
 // thread on the renderer/client process, an IDB message filter assumes the
 // thread_id is the first int.
 
-// IDBCallback message handlers.
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorContinue,
-                     IndexedDBMsg_CallbacksSuccessCursorContinue_Params)
-
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorAdvance,
-                     IndexedDBMsg_CallbacksSuccessCursorContinue_Params)
-
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorPrefetch,
-                     IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params)
-
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessValue,
-                     IndexedDBMsg_CallbacksSuccessValue_Params)
-
-IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessInteger,
-                     int32_t /* ipc_thread_id */,
-                     int32_t /* ipc_callbacks_id */,
-                     int64_t /* value */)
-IPC_MESSAGE_CONTROL4(IndexedDBMsg_CallbacksError,
-                     int32_t /* ipc_thread_id */,
-                     int32_t /* ipc_callbacks_id */,
-                     int /* code */,
-                     base::string16 /* message */)
-
 // IDBDatabaseCallback message handlers
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_DatabaseCallbacksChanges,
                      int32_t, /* ipc_thread_id */
                      IndexedDBMsg_ObserverChanges)
-
-// Indexed DB messages sent from the renderer to the browser.
-
-// WebIDBCursor::advance() message.
-IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_CursorAdvance,
-                     int32_t,  /* ipc_cursor_id */
-                     int32_t,  /* ipc_thread_id */
-                     int32_t,  /* ipc_callbacks_id */
-                     uint32_t) /* count */
-
-// WebIDBCursor::continue() message.
-IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_CursorContinue,
-                     int32_t,               /* ipc_cursor_id */
-                     int32_t,               /* ipc_thread_id */
-                     int32_t,               /* ipc_callbacks_id */
-                     content::IndexedDBKey, /* key */
-                     content::IndexedDBKey) /* primary_key */
-
-// WebIDBCursor::prefetchContinue() message.
-IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_CursorPrefetch,
-                     int32_t, /* ipc_cursor_id */
-                     int32_t, /* ipc_thread_id */
-                     int32_t, /* ipc_callbacks_id */
-                     int32_t) /* n */
-
-// WebIDBCursor::prefetchReset() message.
-IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_CursorPrefetchReset,
-                     int32_t, /* ipc_cursor_id */
-                     int32_t, /* used_prefetches */
-                     int32_t) /* used_prefetches */
-
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_AckReceivedBlobs,
-                     std::vector<std::string>) /* uuids */
-
-// WebIDBDatabase::~WebIDBCursor() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed,
-                     int32_t /* ipc_cursor_id */)