From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 8 Aug 2014 14:30:41 +0200
Subject: Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 chromium/ipc/ipc_message_utils.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'chromium/ipc/ipc_message_utils.cc')

diff --git a/chromium/ipc/ipc_message_utils.cc b/chromium/ipc/ipc_message_utils.cc
index 0390648f457..a67c5f5cf9e 100644
--- a/chromium/ipc/ipc_message_utils.cc
+++ b/chromium/ipc/ipc_message_utils.cc
@@ -340,12 +340,12 @@ void ParamTraits<std::string>::Log(const param_type& p, std::string* l) {
 }
 
 void ParamTraits<std::wstring>::Log(const param_type& p, std::string* l) {
-  l->append(WideToUTF8(p));
+  l->append(base::WideToUTF8(p));
 }
 
 #if !defined(WCHAR_T_IS_UTF16)
 void ParamTraits<base::string16>::Log(const param_type& p, std::string* l) {
-  l->append(UTF16ToUTF8(p));
+  l->append(base::UTF16ToUTF8(p));
 }
 #endif
 
@@ -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(",");
-- 
cgit v1.2.3