Update clipboard classes to use string16 and FilePath instead of wstring.

Update callers as well.

This patch builds on a patch by mark.a.lindner@gmail.com which can be found at http://codereview.chromium.org/28294

Review URL: http://codereview.chromium.org/27370

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

1 files changed, 2 insertions, 14 deletions

diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index 61243f5..e877221 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -512,32 +512,22 @@ struct ParamTraits<std::wstring> {
   }
 };
 
-
 // If WCHAR_T_IS_UTF16 is defined, then string16 is a std::wstring so we don't
 // need this trait.
 #if !defined(WCHAR_T_IS_UTF16)
-
 template <>
 struct ParamTraits<string16> {
   typedef string16 param_type;
   static void Write(Message* m, const param_type& p) {
-    m->WriteData(reinterpret_cast<const char*>(p.data()),
-                 static_cast<int>(p.size() * sizeof(char16)));
+    m->WriteString16(p);
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    if (!m->ReadData(iter, &data, &data_size))
-      return false;
-    r->assign(reinterpret_cast<const char16*>(data),
-              data_size / sizeof(char16));
-    return true;
+    return m->ReadString16(iter, r);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(UTF16ToWide(p));
   }
 };
-
 #endif
 
 template <>
@@ -704,7 +694,6 @@ struct ParamTraits<gfx::Size> {
 };
 
 #if defined(OS_POSIX)
-
 template<>
 struct ParamTraits<base::FileDescriptor> {
   typedef base::FileDescriptor param_type;
@@ -723,7 +712,6 @@ struct ParamTraits<base::FileDescriptor> {
     }
   }
 };
-
 #endif // defined(OS_POSIX)
 
 template<>