Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/gtk/gtk_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
@@ skipping 947 matching lines @@
 bool URLFromPrimarySelection(Profile* profile, GURL* url) {
   GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
   DCHECK(clipboard);
   gchar* selection_text = gtk_clipboard_wait_for_text(clipboard);
   if (!selection_text)
     return false;
 
   // Use autocomplete to clean up the text, going so far as to turn it into
   // a search query if necessary.
   AutocompleteMatch match;
-  profile->GetAutocompleteClassifier()->Classify(UTF8ToUTF16(selection_text),
-      string16(), false, &match, NULL);
+  profile->GetAutocompleteClassifier()->Classify(UTF8ToWide(selection_text),
+      std::wstring(), false, &match, NULL);
   g_free(selection_text);
   if (!match.destination_url.is_valid())
     return false;
 
   *url = match.destination_url;
   return true;
 }
 
 bool AddWindowAlphaChannel(GtkWidget* window) {
   GdkScreen* screen = gtk_widget_get_screen(window);
@@ skipping 261 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util