Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/gtk/tabs/tab_strip_gtk.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/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
@@ skipping 1613 matching lines @@
   const int drop_index = drop_info_->drop_index;
   const bool drop_before = drop_info_->drop_before;
 
   // Destroy the drop indicator.
   drop_info_.reset();
 
   GURL url;
   if (is_plain_text) {
     AutocompleteMatch match;
     model_->profile()->GetAutocompleteClassifier()->Classify(
-        UTF8ToUTF16(reinterpret_cast<char*>(data)), string16(), false,
+        UTF8ToWide(reinterpret_cast<char*>(data)), std::wstring(), false,
         &match, NULL);
     url = match.destination_url;
   } else {
     std::string url_string(reinterpret_cast<char*>(data));
     url = GURL(url_string.substr(0, url_string.find_first_of('\n')));
   }
   if (!url.is_valid())
     return false;
 
   browser::NavigateParams params(window()->browser(), url,
@@ skipping 409 matching lines @@
 
   // Let the middle mouse button initiate clicks as well.
   gtk_util::SetButtonTriggersNavigation(button->widget());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnNewTabClickedThunk), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0);
 
   return button;
 }