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

chrome/browser/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/setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 137 matching lines @@
 }
 
 std::string SetupFlow::GetDialogArgs() const {
     return dialog_start_args_;
 }
 
 void SetupFlow::OnCloseContents(TabContents* source,
                                 bool* out_close_dialog) {
 }
 
-std::wstring SetupFlow::GetDialogTitle() const {
-  return UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_DIALOG_TITLE));
+std::wstring  SetupFlow::GetDialogTitle() const {
+  return l10n_util::GetString(IDS_REMOTING_SETUP_DIALOG_TITLE);
 }
 
 bool SetupFlow::IsDialogModal() const {
   return false;
 }
 
 bool SetupFlow::ShouldShowDialogTitle() const {
   return true;
 }
 
@@ skipping 15 matching lines @@
 void SetupFlow::StartCurrentStep() {
   current_step_->Start(this, NewCallback(this, &SetupFlow::OnStepDone));
 }
 
 void SetupFlow::OnStepDone() {
   current_step_.reset(current_step_->GetNextStep());
   StartCurrentStep();
 }
 
 }  // namespace remoting