Revert 72380 - Remove wstring from autocomplete....

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 230 matching lines @@
     instant->SetCommitOnMouseUp();
   } else {
     instant->CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
   }
 }
 
 void LocationBarViewMac::OnAutocompleteWillAccept() {
   update_instant_ = false;
 }
 
-bool LocationBarViewMac::OnCommitSuggestedText(const string16& typed_text) {
+bool LocationBarViewMac::OnCommitSuggestedText(const std::wstring& typed_text) {
   return edit_view_->CommitSuggestText();
 }
 
 bool LocationBarViewMac::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(browser_->instant());
 }
 
 void LocationBarViewMac::OnPopupBoundsChanged(const gfx::Rect& bounds) {
   InstantController* instant = browser_->instant();
   if (instant)
@@ skipping 48 matching lines @@
   Layout();
 
   InstantController* instant = browser_->instant();
   string16 suggested_text;
   if (update_instant_ && instant && GetTabContents()) {
     if (edit_view_->model()->user_input_in_progress() &&
         edit_view_->model()->popup_model()->IsOpen()) {
       instant->Update
           (browser_->GetSelectedTabContentsWrapper(),
            edit_view_->model()->CurrentMatch(),
-           edit_view_->GetText(),
+           WideToUTF16(edit_view_->GetText()),
            edit_view_->model()->UseVerbatimInstant(),
            &suggested_text);
       if (!instant->MightSupportInstant()) {
-        edit_view_->model()->FinalizeInstantQuery(string16(),
-                                                  string16());
+        edit_view_->model()->FinalizeInstantQuery(std::wstring(),
+                                                  std::wstring());
       }
     } else {
       instant->DestroyPreviewContents();
-      edit_view_->model()->FinalizeInstantQuery(string16(),
-                                                string16());
+      edit_view_->model()->FinalizeInstantQuery(std::wstring(),
+                                                std::wstring());
     }
   }
 
   SetSuggestedText(suggested_text);
 }
 
 void LocationBarViewMac::OnSelectionBoundsChanged() {
   NOTIMPLEMENTED();
 }
 
 void LocationBarViewMac::OnInputInProgress(bool in_progress) {
   toolbar_model_->set_input_in_progress(in_progress);
   Update(NULL, false);
 }
 
 void LocationBarViewMac::OnSetFocus() {
   // Update the keyword and search hint states.
   OnChanged();
 }
 
 void LocationBarViewMac::OnKillFocus() {
   // Do nothing.
 }
 
 SkBitmap LocationBarViewMac::GetFavIcon() const {
   NOTIMPLEMENTED();
   return SkBitmap();
 }
 
-string16 LocationBarViewMac::GetTitle() const {
+std::wstring LocationBarViewMac::GetTitle() const {
   NOTIMPLEMENTED();
-  return string16();
+  return std::wstring();
 }
 
 void LocationBarViewMac::Revert() {
   edit_view_->RevertAll();
 }
 
 // TODO(pamg): Change all these, here and for other platforms, to size_t.
 int LocationBarViewMac::PageActionCount() {
   return static_cast<int>(page_action_decorations_.size());
 }
@@ skipping 140 matching lines @@
   } else {
     const NSRect frame =
         [cell frameForDecoration:location_icon_decoration_.get()
                          inFrame:[field_ bounds]];
     const NSPoint point =
         location_icon_decoration_->GetBubblePointInFrame(frame);
     return [field_ convertPoint:point toView:nil];
   }
 }
 
-NSImage* LocationBarViewMac::GetKeywordImage(const string16& keyword) {
+NSImage* LocationBarViewMac::GetKeywordImage(const std::wstring& keyword) {
   const TemplateURL* template_url =
-      profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
+      profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(
+          WideToUTF16Hack(keyword));
   if (template_url && template_url->IsExtensionKeyword()) {
     const SkBitmap& bitmap = profile_->GetExtensionService()->
         GetOmniboxIcon(template_url->GetExtensionId());
     return gfx::SkBitmapToNSImage(bitmap);
   }
 
   return AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
 }
 
 void LocationBarViewMac::Observe(NotificationType type,
@@ skipping 107 matching lines @@
 
   [cell addRightDecoration:keyword_hint_decoration_.get()];
 
   // By default only the location icon is visible.
   location_icon_decoration_->SetVisible(true);
   selected_keyword_decoration_->SetVisible(false);
   ev_bubble_decoration_->SetVisible(false);
   keyword_hint_decoration_->SetVisible(false);
 
   // Get the keyword to use for keyword-search and hinting.
-  const string16 keyword = edit_view_->model()->keyword();
+  const std::wstring keyword(edit_view_->model()->keyword());
   string16 short_name;
   bool is_extension_keyword = false;
   if (!keyword.empty()) {
     short_name = profile_->GetTemplateURLModel()->
-        GetKeywordShortName(keyword, &is_extension_keyword);
+        GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
   }
 
   const bool is_keyword_hint = edit_view_->model()->is_keyword_hint();
 
   if (!keyword.empty() && !is_keyword_hint) {
     // Switch from location icon to keyword mode.
     location_icon_decoration_->SetVisible(false);
     selected_keyword_decoration_->SetVisible(true);
-    selected_keyword_decoration_->SetKeyword(short_name, is_extension_keyword);
+    selected_keyword_decoration_->SetKeyword(UTF16ToWideHack(short_name),
+                                             is_extension_keyword);
     selected_keyword_decoration_->SetImage(GetKeywordImage(keyword));
   } else if (toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     // Switch from location icon to show the EV bubble instead.
     location_icon_decoration_->SetVisible(false);
     ev_bubble_decoration_->SetVisible(true);
 
     std::wstring label(toolbar_model_->GetEVCertName());
     ev_bubble_decoration_->SetFullLabel(base::SysWideToNSString(label));
   } else if (!keyword.empty() && is_keyword_hint) {
     keyword_hint_decoration_->SetKeyword(short_name,
                                          is_extension_keyword);
     keyword_hint_decoration_->SetVisible(true);
   }
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }