From ec810db7e403d8d9dbc3ce36b5089cb76b632220 Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
 <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 29 Feb 2012 19:20:14 +0000
Subject: Move font_list_async.h to content/public. Switch to Pass() goodness
 to simplify code.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9500008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124224 0039d316-1c4b-4281-b951-d872f2087c98
---
 content/browser/font_list_async.cc | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'content/browser/font_list_async.cc')

diff --git a/content/browser/font_list_async.cc b/content/browser/font_list_async.cc
index 51a5403..032cfdb 100644
--- a/content/browser/font_list_async.cc
+++ b/content/browser/font_list_async.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/font_list_async.h"
+#include "content/public/browser/font_list_async.h"
 
 #include "base/bind.h"
 #include "base/values.h"
@@ -15,30 +15,24 @@ namespace {
 
 // Just executes the given callback with the parameter.
 void ReturnFontListToOriginalThread(
-    const base::Callback<void(scoped_refptr<FontListResult>)>& callback,
-    scoped_refptr<FontListResult> result) {
-  callback.Run(result);
+    const base::Callback<void(scoped_ptr<base::ListValue>)>& callback,
+    scoped_ptr<base::ListValue> result) {
+  callback.Run(result.Pass());
 }
 
 void GetFontListOnFileThread(
     BrowserThread::ID calling_thread_id,
-    const base::Callback<void(scoped_refptr<FontListResult>)>& callback) {
-  scoped_refptr<FontListResult> result(new FontListResult);
-  result->list.reset(GetFontList_SlowBlocking());
+    const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) {
+  scoped_ptr<base::ListValue> result(GetFontList_SlowBlocking());
   BrowserThread::PostTask(calling_thread_id, FROM_HERE,
-      base::Bind(&ReturnFontListToOriginalThread, callback, result));
+      base::Bind(&ReturnFontListToOriginalThread, callback,
+                 base::Passed(&result)));
 }
 
 }  // namespace
 
-FontListResult::FontListResult() {
-}
-
-FontListResult::~FontListResult() {
-}
-
 void GetFontListAsync(
-    const base::Callback<void(scoped_refptr<FontListResult>)>& callback) {
+    const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) {
   BrowserThread::ID id;
   bool well_known_thread = BrowserThread::GetCurrentThreadIdentifier(&id);
   DCHECK(well_known_thread)
-- 
cgit v1.1