De-wstringify OSExchangeData.

(Note that I didn't need to adjust many callers on the Windows
side because wstring and string16 are compatible on Windows.)

BUG=23581

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

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

6 files changed, 17 insertions, 17 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index e089d9b..3af297b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -856,20 +856,20 @@ views::View* AutocompleteEditViewGtk::AddToView(views::View* parent) {
 
 int AutocompleteEditViewGtk::OnPerformDrop(
     const views::DropTargetEvent& event) {
-  std::wstring text;
+  string16 text;
   const ui::OSExchangeData& data = event.data();
   if (data.HasURL()) {
     GURL url;
-    std::wstring title;
+    string16 title;
     if (data.GetURLAndTitle(&url, &title))
-      text = UTF8ToWide(url.spec());
+      text = UTF8ToUTF16(url.spec());
   } else {
-    std::wstring data_string;
+    string16 data_string;
     if (data.GetString(&data_string))
       text = CollapseWhitespace(data_string, true);
   }
 
-  if (!text.empty() && OnPerformDropImpl(WideToUTF16(text)))
+  if (!text.empty() && OnPerformDropImpl(text))
     return CopyOrLinkDragOperation(event.source_operations());
 
   return ui::DragDropTypes::DRAG_NONE;
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index c94d207..5c00445 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -224,9 +224,9 @@ void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
   // clipboard.
   if (elements.size() == 1 && elements[0].is_url) {
     if (elements[0].url.SchemeIs(chrome::kJavaScriptScheme)) {
-      data->SetString(UTF8ToWide(elements[0].url.spec()));
+      data->SetString(UTF8ToUTF16(elements[0].url.spec()));
     } else {
-      data->SetURL(elements[0].url, UTF16ToWide(elements[0].title));
+      data->SetURL(elements[0].url, elements[0].title);
     }
   }
 
@@ -251,9 +251,9 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
     // See if there is a URL on the clipboard.
     Element element;
     GURL url;
-    std::wstring title;
+    string16 title;
     if (data.GetURLAndTitle(&url, &title))
-      ReadFromTuple(url, WideToUTF16(title));
+      ReadFromTuple(url, title);
   }
 
   return is_valid();
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 215997f..69dcce6 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -526,7 +526,7 @@ void DragDownload(const DownloadItem* download,
   // Add URL so that we can load supported files when dragged to TabContents.
   if (net::IsSupportedMimeType(mime_type)) {
     data.SetURL(GURL(WideToUTF8(full_path.ToWStringHack())),
-                     download->GetFileNameToReportUser().ToWStringHack());
+                     download->GetFileNameToReportUser().LossyDisplayName());
   }
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index bba2945..094e6c3 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -92,17 +92,17 @@ int BrowserRootView::OnPerformDrop(const views::DropTargetEvent& event) {
   // do this as the TabStrip doesn't know about the autocomplete edit and needs
   // to know about it to handle 'paste and go'.
   GURL url;
-  std::wstring title;
+  string16 title;
   ui::OSExchangeData mapped_data;
   if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid()) {
     // The url isn't valid. Use the paste and go url.
     if (GetPasteAndGoURL(event.data(), &url))
-      mapped_data.SetURL(url, std::wstring());
+      mapped_data.SetURL(url, string16());
     // else case: couldn't extract a url or 'paste and go' url. This ends up
     // passing through an ui::OSExchangeData with nothing in it. We need to do
     // this so that the tab strip cleans up properly.
   } else {
-    mapped_data.SetURL(url, std::wstring());
+    mapped_data.SetURL(url, string16());
   }
   forwarding_to_tab_strip_ = false;
   scoped_ptr<views::DropTargetEvent> mapped_event(
@@ -141,13 +141,13 @@ bool BrowserRootView::GetPasteAndGoURL(const ui::OSExchangeData& data,
   if (!data.HasString())
     return false;
 
-  std::wstring text;
+  string16 text;
   if (!data.GetString(&text) || text.empty())
     return false;
 
   AutocompleteMatch match;
   browser_view_->browser()->profile()->GetAutocompleteClassifier()->Classify(
-      WideToUTF16Hack(text), string16(), false, &match, NULL);
+      text, string16(), false, &match, NULL);
   if (!match.destination_url.is_valid())
     return false;
 
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
index bbc1476..e983bd0 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
@@ -240,7 +240,7 @@ void TabContentsDragWin::PrepareDragForFileContents(
     }
   }
   file_name = file_name.ReplaceExtension(drop_data.file_extension);
-  data->SetFileContents(file_name.value(), drop_data.file_contents);
+  data->SetFileContents(file_name, drop_data.file_contents);
 }
 
 void TabContentsDragWin::PrepareDragForUrl(const WebDropData& drop_data,
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 7541747..059c7e5 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -354,7 +354,7 @@ int TabStrip::OnPerformDrop(const DropTargetEvent& event) {
   SetDropIndex(-1, false);
 
   GURL url;
-  std::wstring title;
+  string16 title;
   if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid())
     return ui::DragDropTypes::DRAG_NONE;