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

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 382 matching lines @@
     else if (!has_temporary_text_)
       log->inline_autocompleted_length = inline_autocomplete_text_.length();
     NotificationService::current()->Notify(
         NotificationType::OMNIBOX_OPENED_URL, Source<Profile>(profile_),
         Details<AutocompleteLog>(log.get()));
   }
 
   TemplateURLModel* template_url_model = profile_->GetTemplateURLModel();
   if (template_url_model && !keyword.empty()) {
     const TemplateURL* const template_url =
-        template_url_model->GetTemplateURLForKeyword(WideToUTF16Hack(keyword));
+        template_url_model->GetTemplateURLForKeyword(keyword);
 
     // Special case for extension keywords. Don't increment usage count for
     // these.
     if (template_url && template_url->IsExtensionKeyword()) {
       AutocompleteMatch current_match;
       GetInfoForCurrentText(&current_match, NULL);
 
       const AutocompleteMatch& match =
           index == AutocompletePopupModel::kNoMatch ?
               current_match : result().match_at(index);
@@ skipping 413 matching lines @@
             i->inline_autocomplete_offset != std::wstring::npos) {
           suggested_text = WideToUTF16(i->fill_into_edit.substr(
                                            i->inline_autocomplete_offset));
           break;
         }
       }
     }
   }
   controller_->OnSetSuggestedSearchText(suggested_text);
 }