Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/search_engines/template_url_table_model.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util-inl.h"
@@ skipping 161 matching lines @@
 int TemplateURLTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
 string16 TemplateURLTableModel::GetText(int row, int col_id) {
   DCHECK(row >= 0 && row < RowCount());
   const TemplateURL& url = entries_[row]->template_url();
 
   switch (col_id) {
     case IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN: {
-      string16 url_short_name = url.short_name();
+      string16 url_short_name = WideToUTF16Hack(url.short_name());
       // TODO(xji): Consider adding a special case if the short name is a URL,
       // since those should always be displayed LTR. Please refer to
       // http://crbug.com/6726 for more information.
       base::i18n::AdjustStringForLocaleDirection(&url_short_name);
       if (template_url_model_->GetDefaultSearchProvider() == &url) {
         return l10n_util::GetStringFUTF16(
             IDS_SEARCH_ENGINES_EDITOR_DEFAULT_ENGINE,
             url_short_name);
       }
       return url_short_name;
     }
 
     case IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN: {
       // Keyword should be domain name. Force it to have LTR directionality.
-      string16 keyword = url.keyword();
+      string16 keyword = WideToUTF16(url.keyword());
       keyword = base::i18n::GetDisplayStringInLTRDirectionality(keyword);
       return keyword;
     }
 
     default:
       NOTREACHED();
       return string16();
   }
 }
 
@@ skipping 63 matching lines @@
   template_url_model_->AddObserver(this);
 }
 
 void TemplateURLTableModel::ModifyTemplateURL(int index,
                                               const string16& title,
                                               const string16& keyword,
                                               const std::string& url) {
   DCHECK(index >= 0 && index <= RowCount());
   const TemplateURL* template_url = &GetTemplateURL(index);
   template_url_model_->RemoveObserver(this);
-  template_url_model_->ResetTemplateURL(template_url, title, keyword, url);
+  template_url_model_->ResetTemplateURL(template_url, UTF16ToWideHack(title),
+                                        UTF16ToWideHack(keyword), url);
   if (template_url_model_->GetDefaultSearchProvider() == template_url &&
       !TemplateURL::SupportsReplacement(template_url)) {
     // The entry was the default search provider, but the url has been modified
     // so that it no longer supports replacement. Reset the default search
     // provider so that it doesn't point to a bogus entry.
     template_url_model_->SetDefaultSearchProvider(NULL);
   }
   template_url_model_->AddObserver(this);
   ReloadIcon(index);  // Also calls NotifyChanged().
 }
@@ skipping 79 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();
 }