Revert 71167 - Remove wstring from gfx....

chrome/browser/remoting/setup_flow.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 "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 147 matching lines @@
 
 void SetupFlow::GetDOMMessageHandlers(
     std::vector<DOMMessageHandler*>* handlers) const {
   // The called will be responsible for deleting this object.
   handlers->push_back(const_cast<SetupFlow*>(this));
 }
 
 void SetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = profile_->GetPrefs();
   gfx::Font approximate_web_font(
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
+      UTF8ToWide(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
   // TODO(pranavk) Replace the following SYNC resources with REMOTING Resources.
   *size = gfx::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
       IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 }
 
 // A callback to notify the delegate that the dialog closed.
@@ skipping 80 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         new DeleteTask<SetupFlowStep>(current_step_.release()));
   }
 
   current_step_.reset(next_step);
   StartCurrentStep();
 }
 
 }  // namespace remoting