Convert infobar APIs to UTF-16.

chrome/browser/geolocation/geolocation_permission_context.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/geolocation/geolocation_permission_context.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 94 matching lines @@
   // ConfirmInfoBarDelegate
   virtual void InfoBarClosed() {
     controller_->OnInfoBarClosed(render_process_id_, render_view_id_,
                                  bridge_id_);
     delete this;
   }
   virtual Type GetInfoBarType() { return PAGE_ACTION_TYPE; }
   virtual bool Accept() { return OnPermissionSet(true); }
   virtual bool Cancel() { return OnPermissionSet(false); }
   virtual int GetButtons() const { return BUTTON_OK | BUTTON_CANCEL; }
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     switch (button) {
       case BUTTON_OK:
-        return l10n_util::GetString(IDS_GEOLOCATION_ALLOW_BUTTON);
+        return l10n_util::GetStringUTF16(IDS_GEOLOCATION_ALLOW_BUTTON);
       case BUTTON_CANCEL:
-        return l10n_util::GetString(IDS_GEOLOCATION_DENY_BUTTON);
+        return l10n_util::GetStringUTF16(IDS_GEOLOCATION_DENY_BUTTON);
       default:
         // All buttons are labeled above.
         NOTREACHED() << "Bad button id " << button;
-        return L"";
+        return string16();
     }
   }
-  virtual std::wstring GetMessageText() const {
-    return l10n_util::GetStringF(
+  virtual string16 GetMessageText() const {
+    return l10n_util::GetStringFUTF16(
         IDS_GEOLOCATION_INFOBAR_QUESTION,
-        net::FormatUrl(requesting_frame_url_.GetOrigin(), display_languages_));
+        WideToUTF16Hack(net::FormatUrl(requesting_frame_url_.GetOrigin(),
+                                       display_languages_)));
   }
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_GEOLOCATION_INFOBAR_ICON);
   }
-  virtual std::wstring GetLinkText() {
-    return l10n_util::GetString(IDS_LEARN_MORE);
+  virtual string16 GetLinkText() {
+    return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
   }
   virtual bool LinkClicked(WindowOpenDisposition disposition) {
     // Ignore the click dispostion and always open in a new top level tab.
     tab_contents_->OpenURL(
         GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_GEOLOCATION_URL)), GURL(),
         NEW_FOREGROUND_TAB, PageTransition::LINK);
     return false;  // Do not dismiss the info bar.
   }
 
  private:
@@ skipping 317 matching lines @@
         ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(this,
             &GeolocationPermissionContext::CancelPendingInfoBarRequest,
             render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(
       render_process_id, render_view_id, bridge_id);
 }