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

chrome/browser/sync/sync_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/sync/sync_setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 372 matching lines @@
       break;
     default:
       break;
   }
 
   service_->OnUserCancelledDialog();
   delete this;
 }
 
 std::wstring SyncSetupFlow::GetDialogTitle() const {
-  return UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_SYNC_MY_BOOKMARKS_LABEL));
+  return l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL);
 }
 
 bool SyncSetupFlow::IsDialogModal() const {
   return false;
 }
 
 bool SyncSetupFlow::ShouldShowDialogTitle() const {
   return true;
 }
 
@@ skipping 305 matching lines @@
                                       const std::string& mode) {
   if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) {
     service_->SetPassphrase(passphrase, mode == std::string("enter"));
     Advance(SyncSetupWizard::SETTING_UP);
   } else if (configuration_pending_) {
     DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_);
     configuration_.secondary_passphrase = passphrase;
     OnConfigurationComplete();
   }
 }