Convert infobar APIs to UTF-16.

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/histogram.h"
@@ skipping 52 matching lines @@
     delete this;
   }
 
   virtual void InfoBarDismissed() {
     action_taken_ = true;
     UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Closed", 1);
     // User closed the infobar, let's not bug him again with this in the future.
     omnibox_hint_->DisableHint();
   }
 
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetString(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_TEXT);
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_TEXT);
   }
 
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
        IDR_INFOBAR_QUESTION_MARK);
   }
 
   virtual int GetButtons() const {
     return BUTTON_OK;
   }
 
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
-    return l10n_util::GetString(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_BUTTON_LABEL);
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
+    return l10n_util::GetStringUTF16(
+        IDS_OMNIBOX_SEARCH_HINT_INFOBAR_BUTTON_LABEL);
   }
 
   virtual Type GetInfoBarType() { return PAGE_ACTION_TYPE; }
 
   virtual bool Accept() {
     action_taken_ = true;
     UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.ShowMe", 1);
     omnibox_hint_->DisableHint();
     omnibox_hint_->ShowEnteringQuery();
     return true;
@@ skipping 98 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSearchInOmniboxHint);
 }