Revert 71167 - Remove wstring from gfx....

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 355 matching lines @@
 SyncSetupFlow::~SyncSetupFlow() {
   flow_handler_->set_flow(NULL);
   if (owns_flow_handler_) {
     delete flow_handler_;
   }
 }
 
 void SyncSetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = service_->profile()->GetPrefs();
   gfx::Font approximate_web_font = gfx::Font(
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
+      UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
   *size = gfx::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
       IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 
 #if defined(OS_MACOSX)
   // NOTE(akalin): This is a hack to work around a problem with font height on
   // windows.  Basically font metrics are incorrectly returned in logical units
@@ skipping 366 matching lines @@
     service_->OnUserChoseDatatypes(false, registered_types);
   } else if (option == "google") {
     // Implicit passphrase already set up.
     Advance(SyncSetupWizard::DONE);
   }
 }
 
 void SyncSetupFlow::OnGoToDashboard() {
   BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
 }