1 files changed, 10 insertions, 73 deletions

diff --git a/chrome/common/indexed_db_param_traits.h b/chrome/common/indexed_db_param_traits.h
index 4936944..2e43f3e 100644
--- a/chrome/common/indexed_db_param_traits.h
+++ b/chrome/common/indexed_db_param_traits.h
@@ -6,10 +6,12 @@
 #define CHROME_COMMON_INDEXED_DB_PARAM_TRAITS_H_
 #pragma once
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
+#include "ipc/ipc_message.h"
 #include "ipc/ipc_param_traits.h"
 
+class IndexedDBKey;
+class SerializedScriptValue;
+
 namespace IPC {
 
 // These datatypes are used by utility_messages.h and render_messages.h.
@@ -20,82 +22,17 @@ namespace IPC {
 template <>
 struct ParamTraits<SerializedScriptValue> {
   typedef SerializedScriptValue param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.is_null());
-    WriteParam(m, p.is_invalid());
-    WriteParam(m, p.data());
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    bool is_null;
-    bool is_invalid;
-    string16 data;
-    bool ok =
-      ReadParam(m, iter, &is_null) &&
-      ReadParam(m, iter, &is_invalid) &&
-      ReadParam(m, iter, &data);
-    if (!ok)
-    return false;
-    r->set_is_null(is_null);
-    r->set_is_invalid(is_invalid);
-    r->set_data(data);
-    return true;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    l->append("<SerializedScriptValue>(");
-    LogParam(p.is_null(), l);
-    l->append(", ");
-    LogParam(p.is_invalid(), l);
-    l->append(", ");
-    LogParam(p.data(), l);
-    l->append(")");
-  }
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* r);
+  static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<IndexedDBKey> {
   typedef IndexedDBKey param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, int(p.type()));
-    // TODO(jorlow): Technically, we only need to pack the type being used.
-    WriteParam(m, p.string());
-    WriteParam(m, p.number());
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    int type;
-    string16 string;
-    int32 number;
-    bool ok =
-        ReadParam(m, iter, &type) &&
-        ReadParam(m, iter, &string) &&
-        ReadParam(m, iter, &number);
-    if (!ok)
-      return false;
-    switch (type) {
-      case WebKit::WebIDBKey::NullType:
-        r->SetNull();
-        return true;
-      case WebKit::WebIDBKey::StringType:
-        r->Set(string);
-        return true;
-      case WebKit::WebIDBKey::NumberType:
-        r->Set(number);
-        return true;
-      case WebKit::WebIDBKey::InvalidType:
-        r->SetInvalid();
-        return true;
-    }
-    NOTREACHED();
-    return false;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    l->append("<IndexedDBKey>(");
-    LogParam(int(p.type()), l);
-    l->append(", ");
-    LogParam(p.string(), l);
-    l->append(", ");
-    LogParam(p.number(), l);
-    l->append(")");
-  }
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* r);
+  static void Log(const param_type& p, std::string* l);
 };
 
 } // namespace IPC