Convert HtmlDialogUIDelegate::GetDialogTitle() to string16.

chrome/browser/ui/views/html_dialog_view_browsertest.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 "base/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/widget/widget.h"
 
 using testing::Eq;
 
 namespace {
 
 // Window non-client-area means that the minimum size for the window
 // won't be the actual minimum size - our layout and resizing code
 // makes sure the chrome is always visible.
 const int kMinimumWidthToTestFor = 20;
 const int kMinimumHeightToTestFor = 30;
 
 class TestHtmlDialogUIDelegate : public HtmlDialogUIDelegate {
  public:
   TestHtmlDialogUIDelegate() {}
   virtual ~TestHtmlDialogUIDelegate() {}
 
   // HTMLDialogUIDelegate implementation:
-  virtual bool IsDialogModal() const {
+  virtual bool IsDialogModal() const OVERRIDE {
     return true;
   }
-  virtual std::wstring GetDialogTitle() const {
-    return std::wstring(L"Test");
+  virtual string16 GetDialogTitle() const OVERRIDE {
+    return ASCIIToUTF16("Test");
   }
-  virtual GURL GetDialogContentURL() const {
+  virtual GURL GetDialogContentURL() const OVERRIDE {
     return GURL(chrome::kChromeUIChromeURLsURL);
   }
   virtual void GetWebUIMessageHandlers(
-      std::vector<WebUIMessageHandler*>* handlers) const { }
-  virtual void GetDialogSize(gfx::Size* size) const {
+      std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE { }
+  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE {
     size->set_width(40);
     size->set_height(40);
   }
-  virtual std::string GetDialogArgs() const {
+  virtual std::string GetDialogArgs() const OVERRIDE {
     return std::string();
   }
-  virtual void OnDialogClosed(const std::string& json_retval) { }
-  virtual void OnCloseContents(TabContents* source, bool* out_close_dialog) {
+  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE { }
+  virtual void OnCloseContents(TabContents* source, bool* out_close_dialog)
+      OVERRIDE {
     if (out_close_dialog)
       *out_close_dialog = true;
   }
-  virtual bool ShouldShowDialogTitle() const { return true; }
+  virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
 };
 
 }  // namespace
 
 class HtmlDialogBrowserTest : public InProcessBrowserTest {
  public:
   HtmlDialogBrowserTest() {}
 
 #if defined(OS_WIN)
   class WindowChangedObserver : public MessageLoopForUI::Observer {
@@ skipping 154 matching lines @@
       WindowChangedObserver::GetInstance());
   // We use busy loop because the state is updated in notifications.
   while (html_view->state_ != HtmlDialogView::PAINTED)
     MessageLoop::current()->RunAllPending();
 
   EXPECT_EQ(HtmlDialogView::PAINTED, html_view->state_);
 
   MessageLoopForUI::current()->RemoveObserver(
       WindowChangedObserver::GetInstance());
 }