4 files changed, 57 insertions, 57 deletions

diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index 1eee82e..1ee5f7b 100644
--- a/content/public/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -403,49 +403,6 @@ void ParamTraits<net::IPEndPoint>::Log(const param_type& p, std::string* l) {
   LogParam("IPEndPoint:" + p.ToString(), l);
 }
 
-void ParamTraits<base::PlatformFileInfo>::Write(
-    Message* m, const param_type& p) {
-  WriteParam(m, p.size);
-  WriteParam(m, p.is_directory);
-  WriteParam(m, p.last_modified.ToDoubleT());
-  WriteParam(m, p.last_accessed.ToDoubleT());
-  WriteParam(m, p.creation_time.ToDoubleT());
-}
-
-bool ParamTraits<base::PlatformFileInfo>::Read(
-    const Message* m, PickleIterator* iter, param_type* p) {
-  double last_modified;
-  double last_accessed;
-  double creation_time;
-  bool result =
-      ReadParam(m, iter, &p->size) &&
-      ReadParam(m, iter, &p->is_directory) &&
-      ReadParam(m, iter, &last_modified) &&
-      ReadParam(m, iter, &last_accessed) &&
-      ReadParam(m, iter, &creation_time);
-  if (result) {
-    p->last_modified = base::Time::FromDoubleT(last_modified);
-    p->last_accessed = base::Time::FromDoubleT(last_accessed);
-    p->creation_time = base::Time::FromDoubleT(creation_time);
-  }
-  return result;
-}
-
-void ParamTraits<base::PlatformFileInfo>::Log(
-    const param_type& p, std::string* l) {
-  l->append("(");
-  LogParam(p.size, l);
-  l->append(",");
-  LogParam(p.is_directory, l);
-  l->append(",");
-  LogParam(p.last_modified.ToDoubleT(), l);
-  l->append(",");
-  LogParam(p.last_accessed.ToDoubleT(), l);
-  l->append(",");
-  LogParam(p.creation_time.ToDoubleT(), l);
-  l->append(")");
-}
-
 void ParamTraits<content::Referrer>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.url);
diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h
index 36417db..661028e 100644
--- a/content/public/common/common_param_traits.h
+++ b/content/public/common/common_param_traits.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include "base/memory/ref_counted.h"
-#include "base/platform_file.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/security_style.h"
@@ -110,14 +109,6 @@ struct ParamTraits<net::IPEndPoint> {
 };
 
 template <>
-struct ParamTraits<base::PlatformFileInfo> {
-  typedef base::PlatformFileInfo param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
 struct CONTENT_EXPORT ParamTraits<content::Referrer> {
   typedef content::Referrer param_type;
   static void Write(Message* m, const param_type& p);
@@ -242,11 +233,6 @@ struct CONTENT_EXPORT ParamTraits<SkBitmap> {
 };
 
 template <>
-struct SimilarTypeTraits<base::PlatformFileError> {
-  typedef int Type;
-};
-
-template <>
 struct SimilarTypeTraits<WebKit::WebReferrerPolicy> {
   typedef int Type;
 };
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 8f27c52..3caf2a4 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -251,6 +251,49 @@ void ParamTraits<unsigned short>::Log(const param_type& p, std::string* l) {
   l->append(base::UintToString(p));
 }
 
+void ParamTraits<base::PlatformFileInfo>::Write(
+    Message* m, const param_type& p) {
+  WriteParam(m, p.size);
+  WriteParam(m, p.is_directory);
+  WriteParam(m, p.last_modified.ToDoubleT());
+  WriteParam(m, p.last_accessed.ToDoubleT());
+  WriteParam(m, p.creation_time.ToDoubleT());
+}
+
+bool ParamTraits<base::PlatformFileInfo>::Read(
+    const Message* m, PickleIterator* iter, param_type* p) {
+  double last_modified;
+  double last_accessed;
+  double creation_time;
+  bool result =
+      ReadParam(m, iter, &p->size) &&
+      ReadParam(m, iter, &p->is_directory) &&
+      ReadParam(m, iter, &last_modified) &&
+      ReadParam(m, iter, &last_accessed) &&
+      ReadParam(m, iter, &creation_time);
+  if (result) {
+    p->last_modified = base::Time::FromDoubleT(last_modified);
+    p->last_accessed = base::Time::FromDoubleT(last_accessed);
+    p->creation_time = base::Time::FromDoubleT(creation_time);
+  }
+  return result;
+}
+
+void ParamTraits<base::PlatformFileInfo>::Log(
+    const param_type& p, std::string* l) {
+  l->append("(");
+  LogParam(p.size, l);
+  l->append(",");
+  LogParam(p.is_directory, l);
+  l->append(",");
+  LogParam(p.last_modified.ToDoubleT(), l);
+  l->append(",");
+  LogParam(p.last_accessed.ToDoubleT(), l);
+  l->append(",");
+  LogParam(p.creation_time.ToDoubleT(), l);
+  l->append(")");
+}
+
 void ParamTraits<base::Time>::Write(Message* m, const param_type& p) {
   ParamTraits<int64>::Write(m, p.ToInternalValue());
 }
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 9e259f1..d744389 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "base/format_macros.h"
+#include "base/platform_file.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ -335,6 +336,19 @@ struct ParamTraits<double> {
 };
 
 template <>
+struct IPC_EXPORT ParamTraits<base::PlatformFileInfo> {
+  typedef base::PlatformFileInfo param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
+struct SimilarTypeTraits<base::PlatformFileError> {
+  typedef int Type;
+};
+
+template <>
 struct IPC_EXPORT ParamTraits<base::Time> {
   typedef base::Time param_type;
   static void Write(Message* m, const param_type& p);