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

chrome/browser/autocomplete/autocomplete_popup_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/autocomplete/autocomplete_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
@@ skipping 178 matching lines @@
     *alternate_nav_url = result->alternate_nav_url();
 }
 
 bool AutocompletePopupModel::GetKeywordForMatch(const AutocompleteMatch& match,
                                                 std::wstring* keyword) const {
   // Assume we have no keyword until we find otherwise.
   keyword->clear();
 
   // If the current match is a keyword, return that as the selected keyword.
   if (TemplateURL::SupportsReplacement(match.template_url)) {
-    keyword->assign(UTF16ToWideHack(match.template_url->keyword()));
+    keyword->assign(match.template_url->keyword());
     return false;
   }
 
   // See if the current match's fill_into_edit corresponds to a keyword.
   if (!profile_->GetTemplateURLModel())
     return false;
   profile_->GetTemplateURLModel()->Load();
-  const string16 keyword_hint(TemplateURLModel::CleanUserInputKeyword(
-      WideToUTF16Hack(match.fill_into_edit)));
+  const std::wstring keyword_hint(
+      TemplateURLModel::CleanUserInputKeyword(match.fill_into_edit));
   if (keyword_hint.empty())
     return false;
 
   // Don't provide a hint if this keyword doesn't support replacement.
   const TemplateURL* const template_url =
       profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword_hint);
   if (!TemplateURL::SupportsReplacement(template_url))
     return false;
 
   // Don't provide a hint for inactive/disabled extension keywords.
   if (template_url->IsExtensionKeyword()) {
     const Extension* extension = profile_->GetExtensionService()->
         GetExtensionById(template_url->GetExtensionId(), false);
     if (!extension ||
         (profile_->IsOffTheRecord() &&
          !profile_->GetExtensionService()->IsIncognitoEnabled(extension)))
       return false;
   }
 
-  keyword->assign(UTF16ToWideHack(keyword_hint));
+  keyword->assign(keyword_hint);
   return true;
 }
 
 void AutocompletePopupModel::FinalizeInstantQuery(
     const std::wstring& input_text,
     const std::wstring& suggest_text) {
   if (IsOpen()) {
     SearchProvider* search_provider = controller_->search_provider();
     search_provider->FinalizeInstantQuery(input_text, suggest_text);
   }
@@ skipping 72 matching lines @@
 }
 
 const SkBitmap* AutocompletePopupModel::GetSpecialIconForMatch(
     const AutocompleteMatch& match) const {
   if (!match.template_url || !match.template_url->IsExtensionKeyword())
     return NULL;
 
   return &profile_->GetExtensionService()->GetOmniboxPopupIcon(
       match.template_url->GetExtensionId());
 }