Convert GetDisplayStringInLTRDirectionality from wstring to string16.

chrome/browser/search_engines/template_url_table_model.cc

 // Copyright (c) 2010 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/search_engines/template_url_table_model.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 173 matching lines @@
       // http://crbug.com/6726 for more information.
       base::i18n::AdjustStringForLocaleDirection(url_short_name,
                                                  &url_short_name);
       return (template_url_model_->GetDefaultSearchProvider() == &url) ?
           l10n_util::GetStringF(IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
                                 url_short_name) : url_short_name;
     }
 
     case IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN: {
       // Keyword should be domain name. Force it to have LTR directionality.
-      std::wstring keyword(url.keyword());
-      base::i18n::GetDisplayStringInLTRDirectionality(&keyword);
-      return keyword;
+      string16 keyword = WideToUTF16(url.keyword());
+      keyword = base::i18n::GetDisplayStringInLTRDirectionality(keyword);
+      return UTF16ToWide(keyword);
     }
 
     default:
       NOTREACHED();
       return std::wstring();
   }
 }
 
 SkBitmap TemplateURLTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
@@ skipping 154 matching lines @@
 void TemplateURLTableModel::FavIconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLModelChanged() {
   Reload();
 }