Convert CalculateMinString() to string16.

chrome/browser/ui/views/location_bar/selected_keyword_view.cc

 // Copyright (c) 2012 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/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 SelectedKeywordView::SelectedKeywordView(const int background_images[],
                                          int contained_image,
                                          SkColor color,
                                          Profile* profile)
     : IconLabelBubbleView(background_images, contained_image, color),
@@ skipping 39 matching lines @@
   if (!model)
     return;
 
   bool is_extension_keyword;
   const string16 short_name = model->GetKeywordShortName(keyword,
                                                          &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   full_label_.SetText(
       l10n_util::GetStringFUTF16(message_id, short_name));
-  const std::wstring min_string(
-      location_bar_util::CalculateMinString(UTF16ToWide(short_name)));
+  const string16 min_string(location_bar_util::CalculateMinString(short_name));
   partial_label_.SetText(min_string.empty() ?
-      full_label_.text() :
-      l10n_util::GetStringFUTF16(message_id, WideToUTF16(min_string)));
+      full_label_.text() : l10n_util::GetStringFUTF16(message_id, min_string));
 }