Convert indexed_db_messages.h to use generator macros.

BUG=
TEST=

First file converted now that IPC infrastructure has landed.  Can you suggest someone on the indexed_db side to look at what we've done to their file? 
Review URL: http://codereview.chromium.org/6501006

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

4 files changed, 58 insertions, 526 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 7112f9f..01e28c8 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -103,7 +103,6 @@
           'common/hi_res_timer_manager.h',
           'common/indexed_db_key.cc',
           'common/indexed_db_key.h',
-          'common/indexed_db_messages.cc',
           'common/indexed_db_messages.h',
           'common/indexed_db_param_traits.cc',
           'common/indexed_db_param_traits.h',
diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h
index 61e5c04..3a31c77 100644
--- a/chrome/common/common_message_generator.h
+++ b/chrome/common/common_message_generator.h
@@ -4,6 +4,8 @@
 
 // Multiply-included file, hence no include guard.
 
+#include "chrome/common/indexed_db_messages.h"
+
 #if 0  // This feature is not yet enabled for these files.
 
 #include "chrome/common/autofill_messages.h"
@@ -13,7 +15,6 @@
 #include "chrome/common/dom_storage_messages.h"
 #include "chrome/common/file_utilities_messages.h"
 #include "chrome/common/gpu_messages.h"
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/common/mime_registry_messages.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/pepper_file_messages.h"
diff --git a/chrome/common/indexed_db_messages.cc b/chrome/common/indexed_db_messages.cc
deleted file mode 100644
index fdffbc2..0000000
--- a/chrome/common/indexed_db_messages.cc
+++ /dev/null
@@ -1,363 +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/common_param_traits.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/indexed_db_messages.h"
-
-IndexedDBHostMsg_FactoryOpen_Params::IndexedDBHostMsg_FactoryOpen_Params()
-    : routing_id(0),
-      response_id(0),
-      maximum_size(0) {
-}
-
-IndexedDBHostMsg_FactoryOpen_Params::~IndexedDBHostMsg_FactoryOpen_Params() {
-}
-
-IndexedDBHostMsg_DatabaseCreateObjectStore_Params::
-    IndexedDBHostMsg_DatabaseCreateObjectStore_Params()
-    : auto_increment(false),
-      transaction_id(0),
-      idb_database_id(0) {
-}
-
-IndexedDBHostMsg_DatabaseCreateObjectStore_Params::
-    ~IndexedDBHostMsg_DatabaseCreateObjectStore_Params() {
-}
-
-IndexedDBHostMsg_IndexOpenCursor_Params::
-    IndexedDBHostMsg_IndexOpenCursor_Params()
-    : response_id(0),
-      lower_open(false),
-      upper_open(false),
-      direction(0),
-      idb_index_id(0),
-      transaction_id(0) {
-}
-
-IndexedDBHostMsg_IndexOpenCursor_Params::
-    ~IndexedDBHostMsg_IndexOpenCursor_Params() {
-}
-
-
-IndexedDBHostMsg_ObjectStorePut_Params::
-    IndexedDBHostMsg_ObjectStorePut_Params()
-    : idb_object_store_id(0),
-      response_id(0),
-      put_mode(),
-      transaction_id(0) {
-}
-
-IndexedDBHostMsg_ObjectStorePut_Params::
-~IndexedDBHostMsg_ObjectStorePut_Params() {
-}
-
-IndexedDBHostMsg_ObjectStoreCreateIndex_Params::
-    IndexedDBHostMsg_ObjectStoreCreateIndex_Params()
-    : unique(false),
-      transaction_id(0),
-      idb_object_store_id(0) {
-}
-
-IndexedDBHostMsg_ObjectStoreCreateIndex_Params::
-    ~IndexedDBHostMsg_ObjectStoreCreateIndex_Params() {
-}
-
-
-IndexedDBHostMsg_ObjectStoreOpenCursor_Params::
-    IndexedDBHostMsg_ObjectStoreOpenCursor_Params()
-    : response_id(0),
-      lower_open(false),
-      upper_open(false),
-      direction(0),
-      idb_object_store_id(0),
-      transaction_id(0) {
-}
-
-IndexedDBHostMsg_ObjectStoreOpenCursor_Params::
-    ~IndexedDBHostMsg_ObjectStoreOpenCursor_Params() {
-}
-
-namespace IPC {
-
-void ParamTraits<IndexedDBHostMsg_FactoryOpen_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.routing_id);
-  WriteParam(m, p.response_id);
-  WriteParam(m, p.origin);
-  WriteParam(m, p.name);
-  WriteParam(m, p.maximum_size);
-}
-
-bool ParamTraits<IndexedDBHostMsg_FactoryOpen_Params>::Read(const Message* m,
-                                                            void** iter,
-                                                            param_type* p) {
-  return
-      ReadParam(m, iter, &p->routing_id) &&
-      ReadParam(m, iter, &p->response_id) &&
-      ReadParam(m, iter, &p->origin) &&
-      ReadParam(m, iter, &p->name) &&
-      ReadParam(m, iter, &p->maximum_size);
-}
-
-void ParamTraits<IndexedDBHostMsg_FactoryOpen_Params>::Log(const param_type& p,
-                                                           std::string* l) {
-  l->append("(");
-  LogParam(p.routing_id, l);
-  l->append(", ");
-  LogParam(p.response_id, l);
-  l->append(", ");
-  LogParam(p.origin, l);
-  l->append(", ");
-  LogParam(p.name, l);
-  l->append(", ");
-  LogParam(p.maximum_size, l);
-  l->append(")");
-}
-
-void ParamTraits<IndexedDBHostMsg_DatabaseCreateObjectStore_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.name);
-  WriteParam(m, p.key_path);
-  WriteParam(m, p.auto_increment);
-  WriteParam(m, p.transaction_id);
-  WriteParam(m, p.idb_database_id);
-}
-
-bool ParamTraits<IndexedDBHostMsg_DatabaseCreateObjectStore_Params>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return
-      ReadParam(m, iter, &p->name) &&
-      ReadParam(m, iter, &p->key_path) &&
-      ReadParam(m, iter, &p->auto_increment) &&
-      ReadParam(m, iter, &p->transaction_id) &&
-      ReadParam(m, iter, &p->idb_database_id);
-}
-
-void ParamTraits<IndexedDBHostMsg_DatabaseCreateObjectStore_Params>::Log(
-    const param_type& p,
-    std::string* l) {
-  l->append("(");
-  LogParam(p.name, l);
-  l->append(", ");
-  LogParam(p.key_path, l);
-  l->append(", ");
-  LogParam(p.auto_increment, l);
-  l->append(", ");
-  LogParam(p.transaction_id, l);
-  l->append(", ");
-  LogParam(p.idb_database_id, l);
-  l->append(")");
-}
-
-void ParamTraits<IndexedDBHostMsg_IndexOpenCursor_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.response_id);
-  WriteParam(m, p.lower_key);
-  WriteParam(m, p.upper_key);
-  WriteParam(m, p.lower_open);
-  WriteParam(m, p.upper_open);
-  WriteParam(m, p.direction);
-  WriteParam(m, p.idb_index_id);
-  WriteParam(m, p.transaction_id);
-}
-
-bool ParamTraits<IndexedDBHostMsg_IndexOpenCursor_Params>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return
-      ReadParam(m, iter, &p->response_id) &&
-      ReadParam(m, iter, &p->lower_key) &&
-      ReadParam(m, iter, &p->upper_key) &&
-      ReadParam(m, iter, &p->lower_open) &&
-      ReadParam(m, iter, &p->upper_open) &&
-      ReadParam(m, iter, &p->direction) &&
-      ReadParam(m, iter, &p->idb_index_id) &&
-      ReadParam(m, iter, &p->transaction_id);
-}
-
-void ParamTraits<IndexedDBHostMsg_IndexOpenCursor_Params>::Log(
-    const param_type& p,
-    std::string* l) {
-  l->append("(");
-  LogParam(p.response_id, l);
-  l->append(", ");
-  LogParam(p.lower_key, l);
-  l->append(", ");
-  LogParam(p.upper_key, l);
-  l->append(", ");
-  LogParam(p.lower_open, l);
-  l->append(", ");
-  LogParam(p.upper_open, l);
-  l->append(", ");
-  LogParam(p.direction, l);
-  l->append(", ");
-  LogParam(p.idb_index_id, l);
-  l->append(",");
-  LogParam(p.transaction_id, l);
-  l->append(")");
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStorePut_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.idb_object_store_id);
-  WriteParam(m, p.response_id);
-  WriteParam(m, p.serialized_value);
-  WriteParam(m, p.key);
-  WriteParam(m, p.put_mode);
-  WriteParam(m, p.transaction_id);
-}
-
-bool ParamTraits<IndexedDBHostMsg_ObjectStorePut_Params>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return
-      ReadParam(m, iter, &p->idb_object_store_id) &&
-      ReadParam(m, iter, &p->response_id) &&
-      ReadParam(m, iter, &p->serialized_value) &&
-      ReadParam(m, iter, &p->key) &&
-      ReadParam(m, iter, &p->put_mode) &&
-      ReadParam(m, iter, &p->transaction_id);
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStorePut_Params>::Log(
-    const param_type& p,
-    std::string* l) {
-  l->append("(");
-  LogParam(p.idb_object_store_id, l);
-  l->append(", ");
-  LogParam(p.response_id, l);
-  l->append(", ");
-  LogParam(p.serialized_value, l);
-  l->append(", ");
-  LogParam(p.key, l);
-  l->append(", ");
-  LogParam(p.put_mode, l);
-  l->append(", ");
-  LogParam(p.transaction_id, l);
-  l->append(")");
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStoreCreateIndex_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.name);
-  WriteParam(m, p.key_path);
-  WriteParam(m, p.unique);
-  WriteParam(m, p.transaction_id);
-  WriteParam(m, p.idb_object_store_id);
-}
-
-bool ParamTraits<IndexedDBHostMsg_ObjectStoreCreateIndex_Params>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return
-      ReadParam(m, iter, &p->name) &&
-      ReadParam(m, iter, &p->key_path) &&
-      ReadParam(m, iter, &p->unique) &&
-      ReadParam(m, iter, &p->transaction_id) &&
-      ReadParam(m, iter, &p->idb_object_store_id);
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStoreCreateIndex_Params>::Log(
-    const param_type& p,
-    std::string* l) {
-  l->append("(");
-  LogParam(p.name, l);
-  l->append(", ");
-  LogParam(p.key_path, l);
-  l->append(", ");
-  LogParam(p.unique, l);
-  l->append(", ");
-  LogParam(p.transaction_id, l);
-  l->append(", ");
-  LogParam(p.idb_object_store_id, l);
-  l->append(")");
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStoreOpenCursor_Params>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.response_id);
-  WriteParam(m, p.lower_key);
-  WriteParam(m, p.upper_key);
-  WriteParam(m, p.lower_open);
-  WriteParam(m, p.upper_open);
-  WriteParam(m, p.direction);
-  WriteParam(m, p.idb_object_store_id);
-  WriteParam(m, p.transaction_id);
-}
-
-bool ParamTraits<IndexedDBHostMsg_ObjectStoreOpenCursor_Params>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return
-      ReadParam(m, iter, &p->response_id) &&
-      ReadParam(m, iter, &p->lower_key) &&
-      ReadParam(m, iter, &p->upper_key) &&
-      ReadParam(m, iter, &p->lower_open) &&
-      ReadParam(m, iter, &p->upper_open) &&
-      ReadParam(m, iter, &p->direction) &&
-      ReadParam(m, iter, &p->idb_object_store_id) &&
-      ReadParam(m, iter, &p->transaction_id);
-}
-
-void ParamTraits<IndexedDBHostMsg_ObjectStoreOpenCursor_Params>::Log(
-    const param_type& p,
-    std::string* l) {
-  l->append("(");
-  LogParam(p.response_id, l);
-  l->append(", ");
-  LogParam(p.lower_key, l);
-  l->append(", ");
-  LogParam(p.upper_key, l);
-  l->append(", ");
-  LogParam(p.lower_open, l);
-  l->append(", ");
-  LogParam(p.upper_open, l);
-  l->append(", ");
-  LogParam(p.direction, l);
-  l->append(", ");
-  LogParam(p.idb_object_store_id, l);
-  l->append(",");
-  LogParam(p.transaction_id, l);
-  l->append(")");
-}
-
-void ParamTraits<WebKit::WebIDBObjectStore::PutMode>::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, static_cast<int>(p));
-}
-
-bool ParamTraits<WebKit::WebIDBObjectStore::PutMode>::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  int i;
-  bool ok = ReadParam(m, iter, &i);
-  if (!ok)
-    i = 0;
-  *p = static_cast<param_type>(i);
-  return ok;
-}
-
-void ParamTraits<WebKit::WebIDBObjectStore::PutMode>::Log(
-    const param_type& p,
-    std::string* l) {
-  LogParam(static_cast<int>(p), l);
-}
-
-}  // namespace IPC
diff --git a/chrome/common/indexed_db_messages.h b/chrome/common/indexed_db_messages.h
index 6852cfb..1ef5c92 100644
--- a/chrome/common/indexed_db_messages.h
+++ b/chrome/common/indexed_db_messages.h
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_INDEXED_DB_MESSAGES_H_
-#define CHROME_COMMON_INDEXED_DB_MESSAGES_H_
-#pragma once
+// Message definition file, included multiple times, hence no include guard.
+
+#include <vector>
 
 #include "chrome/common/indexed_db_key.h"
 #include "chrome/common/indexed_db_param_traits.h"
@@ -16,211 +16,107 @@
 
 #define IPC_MESSAGE_START IndexedDBMsgStart
 
-// Used to open an indexed database.
-struct IndexedDBHostMsg_FactoryOpen_Params {
-  IndexedDBHostMsg_FactoryOpen_Params();
-  ~IndexedDBHostMsg_FactoryOpen_Params();
+// Argument structures used in messages
 
-  // The routing ID of the view initiating the open.
-  int32 routing_id;
+IPC_ENUM_TRAITS(WebKit::WebIDBObjectStore::PutMode)
 
+// Used to open an indexed database.
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryOpen_Params)
+  // The routing ID of the view initiating the open.
+  IPC_STRUCT_MEMBER(int32, routing_id)
   // The response should have this id.
-  int32 response_id;
-
+  IPC_STRUCT_MEMBER(int32, response_id)
   // The origin doing the initiating.
-  string16 origin;
-
+  IPC_STRUCT_MEMBER(string16, origin)
   // The name of the database.
-  string16 name;
-
+  IPC_STRUCT_MEMBER(string16, name)
   // The maximum size of the database.
-  uint64 maximum_size;
-};
+  IPC_STRUCT_MEMBER(uint64, maximum_size)
+IPC_STRUCT_END()
 
 // Used to create an object store.
-struct IndexedDBHostMsg_DatabaseCreateObjectStore_Params {
-  IndexedDBHostMsg_DatabaseCreateObjectStore_Params();
-  ~IndexedDBHostMsg_DatabaseCreateObjectStore_Params();
-
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
   // The name of the object store.
-  string16 name;
-
+  IPC_STRUCT_MEMBER(string16, name)
   // The keyPath of the object store.
-  NullableString16 key_path;
-
+  IPC_STRUCT_MEMBER(NullableString16, key_path)
   // Whether the object store created should have a key generator.
-  bool auto_increment;
-
+  IPC_STRUCT_MEMBER(bool, auto_increment)
   // The transaction this is associated with.
-  int32 transaction_id;
-
+  IPC_STRUCT_MEMBER(int32, transaction_id)
   // The database the object store belongs to.
-  int32 idb_database_id;
-};
+  IPC_STRUCT_MEMBER(int32, idb_database_id)
+IPC_STRUCT_END()
 
 // Used to open both cursors and object cursors in IndexedDB.
-struct IndexedDBHostMsg_IndexOpenCursor_Params {
-  IndexedDBHostMsg_IndexOpenCursor_Params();
-  ~IndexedDBHostMsg_IndexOpenCursor_Params();
-
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_IndexOpenCursor_Params)
   // The response should have this id.
-  int32 response_id;
-
+  IPC_STRUCT_MEMBER(int32, response_id)
   // The serialized lower key.
-  IndexedDBKey lower_key;
-
+  IPC_STRUCT_MEMBER(IndexedDBKey, lower_key)
   // The serialized upper key.
-  IndexedDBKey upper_key;
-
+  IPC_STRUCT_MEMBER(IndexedDBKey, upper_key)
   // Is the lower bound open?
-  bool lower_open;
-
+  IPC_STRUCT_MEMBER(bool, lower_open)
   // Is the upper bound open?
-  bool upper_open;
-
+  IPC_STRUCT_MEMBER(bool, upper_open)
   // The direction of this cursor.
-  int32 direction;
-
+  IPC_STRUCT_MEMBER(int32, direction)
   // The index the index belongs to.
-  int32 idb_index_id;
-
+  IPC_STRUCT_MEMBER(int32, idb_index_id)
   // The transaction this request belongs to.
-  int transaction_id;
-};
+  IPC_STRUCT_MEMBER(int, transaction_id)
+IPC_STRUCT_END()
 
 // Used to set a value in an object store.
-struct IndexedDBHostMsg_ObjectStorePut_Params {
-  IndexedDBHostMsg_ObjectStorePut_Params();
-  ~IndexedDBHostMsg_ObjectStorePut_Params();
-
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStorePut_Params)
   // The object store's id.
-  int32 idb_object_store_id;
-
+  IPC_STRUCT_MEMBER(int32, idb_object_store_id)
   // The id any response should contain.
-  int32 response_id;
-
+  IPC_STRUCT_MEMBER(int32, response_id)
   // The value to set.
-  SerializedScriptValue serialized_value;
-
+  IPC_STRUCT_MEMBER(SerializedScriptValue, serialized_value)
   // The key to set it on (may not be "valid"/set in some cases).
-  IndexedDBKey key;
-
+  IPC_STRUCT_MEMBER(IndexedDBKey, key)
   // Whether this is an add or a put.
-  WebKit::WebIDBObjectStore::PutMode put_mode;
-
+  IPC_STRUCT_MEMBER(WebKit::WebIDBObjectStore::PutMode, put_mode)
   // The transaction it's associated with.
-  int transaction_id;
-};
+  IPC_STRUCT_MEMBER(int, transaction_id)
+IPC_STRUCT_END()
 
 // Used to create an index.
-struct IndexedDBHostMsg_ObjectStoreCreateIndex_Params {
-  IndexedDBHostMsg_ObjectStoreCreateIndex_Params();
-  ~IndexedDBHostMsg_ObjectStoreCreateIndex_Params();
-
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreCreateIndex_Params)
   // The name of the index.
-  string16 name;
-
+  IPC_STRUCT_MEMBER(string16, name)
   // The keyPath of the index.
-  NullableString16 key_path;
-
+  IPC_STRUCT_MEMBER(NullableString16, key_path)
   // Whether the index created has unique keys.
-  bool unique;
-
+  IPC_STRUCT_MEMBER(bool, unique)
   // The transaction this is associated with.
-  int32 transaction_id;
-
+  IPC_STRUCT_MEMBER(int32, transaction_id)
   // The object store the index belongs to.
-  int32 idb_object_store_id;
-};
+  IPC_STRUCT_MEMBER(int32, idb_object_store_id)
+IPC_STRUCT_END()
 
 // Used to open an IndexedDB cursor.
-struct IndexedDBHostMsg_ObjectStoreOpenCursor_Params {
-  IndexedDBHostMsg_ObjectStoreOpenCursor_Params();
-  ~IndexedDBHostMsg_ObjectStoreOpenCursor_Params();
-
+IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreOpenCursor_Params)
   // The response should have this id.
-  int32 response_id;
-
+  IPC_STRUCT_MEMBER(int32, response_id)
   // The serialized lower key.
-  IndexedDBKey lower_key;
-
+  IPC_STRUCT_MEMBER(IndexedDBKey, lower_key)
   // The serialized upper key.
-  IndexedDBKey upper_key;
-
+  IPC_STRUCT_MEMBER(IndexedDBKey, upper_key)
   // Is the lower bound open?
-  bool lower_open;
-
+  IPC_STRUCT_MEMBER(bool, lower_open)
   // Is the upper bound open?
-  bool upper_open;
-
+  IPC_STRUCT_MEMBER(bool, upper_open)
   // The direction of this cursor.
-  int32 direction;
-
+  IPC_STRUCT_MEMBER(int32, direction)
   // The object store the cursor belongs to.
-  int32 idb_object_store_id;
-
+  IPC_STRUCT_MEMBER(int32, idb_object_store_id)
   // The transaction this request belongs to.
-  int transaction_id;
-};
-
-namespace IPC {
-template <>
-struct ParamTraits<IndexedDBHostMsg_FactoryOpen_Params> {
-  typedef IndexedDBHostMsg_FactoryOpen_Params 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<IndexedDBHostMsg_DatabaseCreateObjectStore_Params> {
-  typedef IndexedDBHostMsg_DatabaseCreateObjectStore_Params 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<IndexedDBHostMsg_IndexOpenCursor_Params> {
-  typedef IndexedDBHostMsg_IndexOpenCursor_Params 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<IndexedDBHostMsg_ObjectStorePut_Params> {
-  typedef IndexedDBHostMsg_ObjectStorePut_Params 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<IndexedDBHostMsg_ObjectStoreCreateIndex_Params> {
-  typedef IndexedDBHostMsg_ObjectStoreCreateIndex_Params 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<IndexedDBHostMsg_ObjectStoreOpenCursor_Params> {
-  typedef IndexedDBHostMsg_ObjectStoreOpenCursor_Params 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::WebIDBObjectStore::PutMode> {
-  typedef WebKit::WebIDBObjectStore::PutMode 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);
-};
-
-}  // namespace IPC
+  IPC_STRUCT_MEMBER(int, transaction_id)
+IPC_STRUCT_END()
 
 // Indexed DB messages sent from the browser to the renderer.
 
@@ -508,4 +404,3 @@ IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents,
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed,
                      int32 /* idb_transaction_id */)
 
-#endif  // CHROME_COMMON_INDEXED_DB_MESSAGES_H_