Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/ui/views/location_bar/keyword_hint_view.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/views/location_bar/keyword_hint_view.h"
 
-#include <vector>
-
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 41 matching lines @@
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (!url_service)
     return;
 
   std::vector<size_t> content_param_offsets;
   bool is_extension_keyword;
   string16 short_name = url_service->GetKeywordShortName(keyword,
                                                          &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_HINT : IDS_OMNIBOX_KEYWORD_HINT;
-  const string16 keyword_hint = l10n_util::GetStringFUTF16(
-      message_id,
-      string16(),
-      short_name,
-      &content_param_offsets);
+  const std::wstring keyword_hint =
+      UTF16ToWide(l10n_util::GetStringFUTF16(
+          message_id,
+          string16(),
+          short_name,
+          &content_param_offsets));
   if (content_param_offsets.size() == 2) {
     leading_label_->SetText(
         keyword_hint.substr(0, content_param_offsets.front()));
     trailing_label_->SetText(
         keyword_hint.substr(content_param_offsets.front()));
   } else {
     // See comments on an identical NOTREACHED() in search_provider.cc.
     NOTREACHED();
   }
 }
@@ skipping 42 matching lines @@
 
   if (show_labels) {
     pref = leading_label_->GetPreferredSize();
     leading_label_->SetBounds(x, 0, pref.width(), height());
 
     x += pref.width() + kTabButtonBitmap->width();
     pref = trailing_label_->GetPreferredSize();
     trailing_label_->SetBounds(x, 0, pref.width(), height());
   }
 }