3 files changed, 12 insertions, 11 deletions
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index b652443..a67c5f5 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -555,8 +555,8 @@ void ParamTraits<base::NullableString16>::Log(const param_type& p,
   l->append(")");
 }
 
-void ParamTraits<base::PlatformFileInfo>::Write(Message* m,
-                                                const param_type& p) {
+void ParamTraits<base::File::Info>::Write(Message* m,
+                                          const param_type& p) {
   WriteParam(m, p.size);
   WriteParam(m, p.is_directory);
   WriteParam(m, p.last_modified.ToDoubleT());
@@ -564,9 +564,9 @@ void ParamTraits<base::PlatformFileInfo>::Write(Message* m,
   WriteParam(m, p.creation_time.ToDoubleT());
 }
 
-bool ParamTraits<base::PlatformFileInfo>::Read(const Message* m,
-                                               PickleIterator* iter,
-                                               param_type* p) {
+bool ParamTraits<base::File::Info>::Read(const Message* m,
+                                         PickleIterator* iter,
+                                         param_type* p) {
   double last_modified;
   double last_accessed;
   double creation_time;
@@ -584,8 +584,8 @@ bool ParamTraits<base::PlatformFileInfo>::Read(const Message* m,
   return result;
 }
 
-void ParamTraits<base::PlatformFileInfo>::Log(const param_type& p,
-                                              std::string* l) {
+void ParamTraits<base::File::Info>::Log(const param_type& p,
+                                        std::string* l) {
   l->append("(");
   LogParam(p.size, l);
   l->append(",");
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 24b38af..b05f76d 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -11,9 +11,9 @@
 #include <string>
 #include <vector>
 
+#include "base/files/file.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_vector.h"
-#include "base/platform_file.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -474,15 +474,15 @@ struct IPC_EXPORT ParamTraits<base::NullableString16> {
 };
 
 template <>
-struct IPC_EXPORT ParamTraits<base::PlatformFileInfo> {
-  typedef base::PlatformFileInfo param_type;
+struct IPC_EXPORT ParamTraits<base::File::Info> {
+  typedef base::File::Info 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> {
+struct SimilarTypeTraits<base::File::Error> {
   typedef int Type;
 };
 
diff --git a/ipc/ipc_platform_file.h b/ipc/ipc_platform_file.h
index 553c78c..d3a605e 100644
--- a/ipc/ipc_platform_file.h
+++ b/ipc/ipc_platform_file.h
@@ -6,6 +6,7 @@
 #define IPC_IPC_PLATFORM_FILE_H_
 
 #include "base/basictypes.h"
+#include "base/files/file.h"
 #include "base/platform_file.h"
 #include "base/process/process.h"
 #include "ipc/ipc_export.h"