Revert 70271 - Remove wstring from l10n_util. Part 3....

chrome/browser/remoting/remoting_setup_flow.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/remoting/remoting_setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "base/json/json_writer.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
@@ skipping 147 matching lines @@
 }
 
 std::string RemotingSetupFlow::GetDialogArgs() const {
     return dialog_start_args_;
 }
 
 void  RemotingSetupFlow::OnCloseContents(TabContents* source,
                                          bool* out_close_dialog) {
 }
 
-std::wstring RemotingSetupFlow::GetDialogTitle() const {
-  return UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_DIALOG_TITLE));
+std::wstring  RemotingSetupFlow::GetDialogTitle() const {
+  return l10n_util::GetString(IDS_REMOTING_SETUP_DIALOG_TITLE);
 }
 
 bool  RemotingSetupFlow::IsDialogModal() const {
   return true;
 }
 
 bool RemotingSetupFlow::ShouldShowDialogTitle() const {
   return true;
 }
 
@@ skipping 129 matching lines @@
 }
 
 void RemotingSetupFlow::ExecuteJavascriptInIFrame(
     const std::wstring& iframe_xpath,
     const std::wstring& js) {
   if (dom_ui_) {
     RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host();
     rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
   }
 }