Modified clipboard classes to use string16 instead of std::wstring

chrome/browser/renderer_host/resource_message_filter.cc

Index: chrome/browser/renderer_host/resource_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/resource_message_filter.cc	(revision 10774)
+++ chrome/browser/renderer_host/resource_message_filter.cc	(working copy)
@@ -535,7 +535,9 @@
 }
 
 void ResourceMessageFilter::OnClipboardReadText(std::wstring* result) {
-  GetClipboardService()->ReadText(result);
+  string16 text;
+  GetClipboardService()->ReadText(&text);
+  *result = UTF16ToWideHack(text);
 }
 
 void ResourceMessageFilter::OnClipboardReadAsciiText(std::string* result) {
@@ -545,7 +547,9 @@
 void ResourceMessageFilter::OnClipboardReadHTML(std::wstring* markup,
                                                 GURL* src_url) {
   std::string src_url_str;
-  GetClipboardService()->ReadHTML(markup, &src_url_str);
+  string16 html;
+  GetClipboardService()->ReadHTML(&html, &src_url_str);
+  *markup = UTF16ToWideHack(html);
   *src_url = GURL(src_url_str);
 }