Convert infobar APIs to UTF-16.

chrome/browser/ssl/ssl_policy_backend.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/ssl/ssl_policy_backend.h"
 
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 class SSLInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   SSLInfoBarDelegate(TabContents* contents,
-                     const std::wstring message,
-                     const std::wstring& button_label,
+                     const string16& message,
+                     const string16& button_label,
                      Task* task)
     : ConfirmInfoBarDelegate(contents),
       message_(message),
       button_label_(button_label),
       task_(task) {
   }
   virtual ~SSLInfoBarDelegate() {}
 
   // Overridden from ConfirmInfoBarDelegate:
   virtual void InfoBarClosed() {
     delete this;
   }
-  virtual std::wstring GetMessageText() const {
+  virtual string16 GetMessageText() const {
     return message_;
   }
   virtual SkBitmap* GetIcon() const {
     return ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_INFOBAR_SSL_WARNING);
   }
   virtual int GetButtons() const {
     return !button_label_.empty() ? BUTTON_OK : BUTTON_NONE;
   }
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const {
+  virtual string16 GetButtonLabel(InfoBarButton button) const {
     return button_label_;
   }
   virtual bool Accept() {
     if (task_.get()) {
       task_->Run();
       task_.reset();  // Ensures we won't run the task again.
     }
     return true;
   }
 
  private:
   // Labels for the InfoBar's message and button.
-  std::wstring message_;
-  std::wstring button_label_;
+  string16 message_;
+  string16 button_label_;
 
   // A task to run when the InfoBar is accepted.
   scoped_ptr<Task> task_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLInfoBarDelegate);
 };
 
 SSLPolicyBackend::SSLPolicyBackend(NavigationController* controller)
     : controller_(controller),
       ssl_host_state_(controller->profile()->GetSSLHostState()) {
@@ skipping 20 matching lines @@
 
   NavigationEntry* entry = controller_->GetActiveEntry();
   if (!entry)
     return;
 
   // Don't show the message if the user doesn't expect an authenticated session.
   if (entry->ssl().security_style() <= SECURITY_STYLE_UNAUTHENTICATED)
     return;
 
   if (controller_->tab_contents()) {
+    // TODO(evanm): remove base/utf_string_conversions.h include after fixing
+    // below conversions.
     controller_->tab_contents()->AddInfoBar(
-        new SSLInfoBarDelegate(controller_->tab_contents(), msg, link_text,
+        new SSLInfoBarDelegate(controller_->tab_contents(),
+                               WideToUTF16Hack(msg),
+                               WideToUTF16Hack(link_text),
                                task));
   }
 }
 
 void SSLPolicyBackend::HostRanInsecureContent(const std::string& host,
                                               int id) {
   ssl_host_state_->HostRanInsecureContent(host, id);
   SSLManager::NotifySSLInternalStateChanged();
 }
 
@@ skipping 22 matching lines @@
   for (iter = pending_messages_.begin();
        iter != pending_messages_.end(); ++iter) {
     ShowMessageWithLink(iter->message, iter->link_text, iter->action);
   }
   ClearPendingMessages();
 }
 
 void SSLPolicyBackend::ClearPendingMessages() {
   pending_messages_.clear();
 }