Change string16 to std::string in the gfx::Font() interface.

chrome/browser/printing/cloud_print/cloud_print_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/printing/cloud_print/cloud_print_setup_flow.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 115 matching lines @@
   // Create the message handler only after we are asked, the caller is
   // responsible for deleting the objects.
   handlers->push_back(
       new CloudPrintSetupMessageHandler(
           const_cast<CloudPrintSetupFlow*>(this)));
 }
 
 void CloudPrintSetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = profile_->GetPrefs();
   gfx::Font approximate_web_font(
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
+      prefs->GetString(prefs::kWebKitSansSerifFontFamily),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
   if (setup_done_) {
     *size = ui::GetLocalizedContentsSizeForFont(
         IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS,
         IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_HEIGHT_LINES,
         approximate_web_font);
   } else {
     *size = ui::GetLocalizedContentsSizeForFont(
         IDS_CLOUD_PRINT_SETUP_WIZARD_WIDTH_CHARS,
@@ skipping 158 matching lines @@
   string16 message = l10n_util::GetStringFUTF16(IDS_CLOUD_PRINT_SETUP_DONE,
                                                 product_name,
                                                 UTF8ToUTF16(login_));
   string16 javascript(ASCIIToUTF16("cloudprint.setMessage('") + message +
                       ASCIIToUTF16("');"));
   ExecuteJavascriptInIFrame(DoneIframeXPath(), javascript);
 
   if (web_ui_) {
     PrefService* prefs = profile_->GetPrefs();
     gfx::Font approximate_web_font(
-        UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
+        prefs->GetString(prefs::kWebKitSansSerifFontFamily),
         prefs->GetInteger(prefs::kWebKitDefaultFontSize));
     gfx::Size done_size = ui::GetLocalizedContentsSizeForFont(
         IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS,
         IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_HEIGHT_LINES,
         approximate_web_font);
 
     base::FundamentalValue new_width(done_size.width());
     base::FundamentalValue new_height(done_size.height());
     web_ui_->CallJavascriptFunction("cloudprint.showSetupDone",
                                     new_width, new_height);
   }
 
   ExecuteJavascriptInIFrame(DoneIframeXPath(),
                             ASCIIToUTF16("cloudprint.onPageShown();"));
 }
 
 void CloudPrintSetupFlow::ExecuteJavascriptInIFrame(
     const string16& iframe_xpath,
     const string16& js) {
   if (web_ui_) {
     RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host();
     rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
   }
 }