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

base/clipboard_linux.cc

Index: base/clipboard_linux.cc
===================================================================
--- base/clipboard_linux.cc	(revision 10811)
+++ base/clipboard_linux.cc	(working copy)
@@ -200,7 +200,7 @@
   return retval;
 }
 
-void Clipboard::ReadText(std::wstring* result) const {
+void Clipboard::ReadText(string16* result) const {
   result->clear();
   gchar* text = gtk_clipboard_wait_for_text(clipboard_);
 
@@ -208,7 +208,7 @@
    return;
 
   // TODO(estade): do we want to handle the possible error here?
-  UTF8ToWide(text, strlen(text), result);
+  UTF8ToUTF16(text, strlen(text), result);
   g_free(text);
 }
 
@@ -223,8 +223,12 @@
   g_free(text);
 }
 
+void Clipboard::ReadFile(FilePath* file) const {
+  *file = FilePath();
+}
+
 // TODO(estade): handle different charsets.
-void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const {
+void Clipboard::ReadHTML(string16* markup, std::string* src_url) const {
   markup->clear();
 
   GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard_,
@@ -233,9 +237,9 @@
   if (!data)
     return;
 
-  UTF8ToWide(reinterpret_cast<char*>(data->data),
-             strlen(reinterpret_cast<char*>(data->data)),
-             markup);
+  UTF8ToUTF16(reinterpret_cast<char*>(data->data),
+              strlen(reinterpret_cast<char*>(data->data)),
+              markup);
   gtk_selection_data_free(data);
 }