Revert 60275.

TEST=none
BUG=none

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

4 files changed, 33 insertions, 106 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 2b810af..4fcb1e5 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -95,7 +95,6 @@ struct ViewHostMsg_IDBDatabaseCreateObjectStore_Params;
 struct ViewHostMsg_IDBIndexOpenCursor_Params;
 struct ViewHostMsg_IDBObjectStoreCreateIndex_Params;
 struct ViewHostMsg_IDBObjectStoreOpenCursor_Params;
-struct ViewHostMsg_IDBObjectStorePut_Params;
 struct ViewMsg_ExecuteCode_Params;
 struct ViewHostMsg_CreateWorker_Params;
 struct ViewHostMsg_ShowNotification_Params;
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 0149bf4..969ea16 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -2462,18 +2462,16 @@ IPC_BEGIN_MESSAGES(ViewHost)
                        ViewHostMsg_IDBIndexOpenCursor_Params)
 
   // WebIDBIndex::getObject() message.
-  IPC_MESSAGE_CONTROL4(ViewHostMsg_IDBIndexGetObject,
+  IPC_MESSAGE_CONTROL3(ViewHostMsg_IDBIndexGetObject,
                        int32, /* idb_index_id */
                        int32, /* response_id */
-                       IndexedDBKey, /* key */
-                       int /* transaction_id */)
+                       IndexedDBKey /* key */)
 
   // WebIDBIndex::get() message.
-  IPC_MESSAGE_CONTROL4(ViewHostMsg_IDBIndexGet,
+  IPC_MESSAGE_CONTROL3(ViewHostMsg_IDBIndexGet,
                        int32, /* idb_index_id */
                        int32, /* response_id */
-                       IndexedDBKey, /* key */
-                       int /* transaction_id */)
+                       IndexedDBKey /* key */)
 
   // WebIDBIndex::~WebIDBIndex() message.
   IPC_MESSAGE_CONTROL1(ViewHostMsg_IDBIndexDestroyed,
@@ -2495,22 +2493,24 @@ IPC_BEGIN_MESSAGES(ViewHost)
                               std::vector<string16> /* index_names */)
 
   // WebIDBObjectStore::get() message.
-  IPC_MESSAGE_CONTROL4(ViewHostMsg_IDBObjectStoreGet,
+  IPC_MESSAGE_CONTROL3(ViewHostMsg_IDBObjectStoreGet,
                        int32, /* idb_object_store_id */
                        int32, /* response_id */
-                       IndexedDBKey, /* key */
-                       int /* transaction_id */)
+                       IndexedDBKey /* key */)
 
   // WebIDBObjectStore::put() message.
-  IPC_MESSAGE_CONTROL1(ViewHostMsg_IDBObjectStorePut,
-                       ViewHostMsg_IDBObjectStorePut_Params)
+  IPC_MESSAGE_CONTROL5(ViewHostMsg_IDBObjectStorePut,
+                       int32, /* idb_object_store_id */
+                       int32, /* response_id */
+                       SerializedScriptValue, /* serialized_value */
+                       IndexedDBKey, /* key */
+                       bool /* add_only */)
 
   // WebIDBObjectStore::remove() message.
-  IPC_MESSAGE_CONTROL4(ViewHostMsg_IDBObjectStoreRemove,
+  IPC_MESSAGE_CONTROL3(ViewHostMsg_IDBObjectStoreRemove,
                        int32, /* idb_object_store_id */
                        int32, /* response_id */
-                       IndexedDBKey, /* key */
-                       int /* transaction_id */)
+                       IndexedDBKey /* key */)
 
   // WebIDBObjectStore::createIndex() message.
   IPC_MESSAGE_CONTROL1(ViewHostMsg_IDBObjectStoreCreateIndex,
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index bcd47f6..4fd83a3 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -181,20 +181,31 @@ ViewHostMsg_IDBFactoryOpen_Params::~ViewHostMsg_IDBFactoryOpen_Params() {
 ViewHostMsg_IDBDatabaseCreateObjectStore_Params::
     ViewHostMsg_IDBDatabaseCreateObjectStore_Params()
     : response_id_(0),
-      auto_increment_(false) {
+      auto_increment_(false),
+      idb_database_id_(0) {
 }
 
 ViewHostMsg_IDBDatabaseCreateObjectStore_Params::
     ~ViewHostMsg_IDBDatabaseCreateObjectStore_Params() {
 }
 
+ViewHostMsg_IDBObjectStoreCreateIndex_Params::
+    ViewHostMsg_IDBObjectStoreCreateIndex_Params()
+    : response_id_(0),
+      unique_(false),
+      idb_object_store_id_(0) {
+}
+
+ViewHostMsg_IDBObjectStoreCreateIndex_Params::
+    ~ViewHostMsg_IDBObjectStoreCreateIndex_Params() {
+}
+
 ViewHostMsg_IDBObjectStoreOpenCursor_Params::
     ViewHostMsg_IDBObjectStoreOpenCursor_Params()
     : response_id_(0),
       flags_(0),
       direction_(0),
-      idb_object_store_id_(0),
-      transaction_id_(0) {
+      idb_object_store_id_(0) {
 }
 
 ViewHostMsg_IDBObjectStoreOpenCursor_Params::
@@ -1259,7 +1270,6 @@ void ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params>::Write(
   WriteParam(m, p.key_flags_);
   WriteParam(m, p.direction_);
   WriteParam(m, p.idb_index_id_);
-  WriteParam(m, p.transaction_id_);
 }
 
 bool ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params>::Read(
@@ -1272,8 +1282,7 @@ bool ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params>::Read(
       ReadParam(m, iter, &p->right_key_) &&
       ReadParam(m, iter, &p->key_flags_) &&
       ReadParam(m, iter, &p->direction_) &&
-      ReadParam(m, iter, &p->idb_index_id_) &&
-      ReadParam(m, iter, &p->transaction_id_);
+      ReadParam(m, iter, &p->idb_index_id_);
 }
 
 void ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params>::Log(
@@ -1291,50 +1300,6 @@ void ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params>::Log(
   LogParam(p.direction_, l);
   l->append(", ");
   LogParam(p.idb_index_id_, l);
-  l->append(",");
-  LogParam(p.transaction_id_, l);
-  l->append(")");
-}
-
-void ParamTraits<ViewHostMsg_IDBObjectStorePut_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.add_only_);
-  WriteParam(m, p.transaction_id_);
-}
-
-bool ParamTraits<ViewHostMsg_IDBObjectStorePut_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->add_only_) &&
-      ReadParam(m, iter, &p->transaction_id_);
-}
-
-void ParamTraits<ViewHostMsg_IDBObjectStorePut_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.add_only_, l);
-  l->append(", ");
-  LogParam(p.transaction_id_, l);
   l->append(")");
 }
 
@@ -1385,7 +1350,6 @@ void ParamTraits<ViewHostMsg_IDBObjectStoreOpenCursor_Params>::Write(
   WriteParam(m, p.flags_);
   WriteParam(m, p.direction_);
   WriteParam(m, p.idb_object_store_id_);
-  WriteParam(m, p.transaction_id_);
 }
 
 bool ParamTraits<ViewHostMsg_IDBObjectStoreOpenCursor_Params>::Read(
@@ -1398,8 +1362,7 @@ bool ParamTraits<ViewHostMsg_IDBObjectStoreOpenCursor_Params>::Read(
       ReadParam(m, iter, &p->right_key_) &&
       ReadParam(m, iter, &p->flags_) &&
       ReadParam(m, iter, &p->direction_) &&
-      ReadParam(m, iter, &p->idb_object_store_id_) &&
-      ReadParam(m, iter, &p->transaction_id_);
+      ReadParam(m, iter, &p->idb_object_store_id_);
 }
 
 void ParamTraits<ViewHostMsg_IDBObjectStoreOpenCursor_Params>::Log(
@@ -1417,8 +1380,6 @@ void ParamTraits<ViewHostMsg_IDBObjectStoreOpenCursor_Params>::Log(
   LogParam(p.direction_, l);
   l->append(", ");
   LogParam(p.idb_object_store_id_, l);
-  l->append(",");
-  LogParam(p.transaction_id_, l);
   l->append(")");
 }
 
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 05c2d7e..70f9825 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -25,7 +25,6 @@
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/renderer_preferences.h"
-#include "chrome/common/serialized_script_value.h"
 #include "chrome/common/window_container_type.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_param_traits.h"
@@ -672,34 +671,13 @@ struct ViewHostMsg_IDBIndexOpenCursor_Params {
 
   // The index the index belongs to.
   int32 idb_index_id_;
-
-  // The transaction this request belongs to.
-  int transaction_id_;
-};
-
-// Used to set a value in an object store.
-struct ViewHostMsg_IDBObjectStorePut_Params {
-  // The object store's id.
-  int32 idb_object_store_id_;
-
-  // The id any response should contain.
-  int32 response_id_;
-
-  // The value to set.
-  SerializedScriptValue serialized_value_;
-
-  // The key to set it on (may not be "valid"/set in some cases).
-  IndexedDBKey key_;
-
-  // If it already exists, don't update (just return an error).
-  bool add_only_;
-
-  // The transaciton it's associated with.
-  int transaction_id_;
 };
 
 // Used to create an index.
 struct ViewHostMsg_IDBObjectStoreCreateIndex_Params {
+  ViewHostMsg_IDBObjectStoreCreateIndex_Params();
+  ~ViewHostMsg_IDBObjectStoreCreateIndex_Params();
+
   // The response should have this id.
   int32 response_id_;
 
@@ -738,9 +716,6 @@ struct ViewHostMsg_IDBObjectStoreOpenCursor_Params {
 
   // The object store the cursor belongs to.
   int32 idb_object_store_id_;
-
-  // The transaction this request belongs to.
-  int transaction_id_;
 };
 
 // Allows an extension to execute code in a tab.
@@ -1166,14 +1141,6 @@ struct ParamTraits<ViewHostMsg_IDBIndexOpenCursor_Params> {
 };
 
 template <>
-struct ParamTraits<ViewHostMsg_IDBObjectStorePut_Params> {
-  typedef ViewHostMsg_IDBObjectStorePut_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<ViewHostMsg_IDBObjectStoreCreateIndex_Params> {
   typedef ViewHostMsg_IDBObjectStoreCreateIndex_Params param_type;
   static void Write(Message* m, const param_type& p);