Move font_list_async.h to content/public. Switch to Pass() goodness to simplify code.

chrome/browser/ui/webui/options2/font_settings_handler2.cc

 // Copyright (c) 2012 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/ui/webui/options2/font_settings_handler2.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/options2/font_settings_utils2.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/font_list_async.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options2 {
 
 FontSettingsHandler::FontSettingsHandler() {
 }
@@ skipping 68 matching lines @@
                  base::Unretained(this)));
 }
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
   content::GetFontListAsync(
       base::Bind(&FontSettingsHandler::FontsListHasLoaded,
                  base::Unretained(this)));
 }
 
 void FontSettingsHandler::FontsListHasLoaded(
-    scoped_refptr<content::FontListResult> list) {
+    scoped_ptr<base::ListValue> list) {
   ListValue encoding_list;
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
       pref_service->GetString(prefs::kStaticEncodings),
       pref_service->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
@@ skipping 17 matching lines @@
   }
 
   ListValue selected_values;
   selected_values.Append(Value::CreateStringValue(standard_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(serif_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(sans_serif_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(fixed_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
 
   web_ui()->CallJavascriptFunction("FontSettings.setFontsData",
-                                   *list->list.get(), encoding_list,
+                                   *list.get(), encoding_list,
                                    selected_values);
 }
 
 void FontSettingsHandler::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kWebKitGlobalStandardFontFamily) {
       SetUpStandardFontSample();
@@ skipping 42 matching lines @@
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   base::FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui()->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                    size_value);
 }
 
 }  // namespace options2