| Index: content/browser/font_list_async.cc
|
| diff --git a/content/browser/font_list_async.cc b/content/browser/font_list_async.cc
|
| index 730f6731c509c904101b9662865f30efc0e65bdd..70834861ec8bb87aa920e06a4757f3c8d4fdbcf4 100644
|
| --- a/content/browser/font_list_async.cc
|
| +++ b/content/browser/font_list_async.cc
|
| @@ -17,15 +17,15 @@ namespace {
|
|
|
| // Just executes the given callback with the parameter.
|
| void ReturnFontListToOriginalThread(
|
| - const base::Callback<void(scoped_ptr<base::ListValue>)>& callback,
|
| - scoped_ptr<base::ListValue> result) {
|
| + const base::Callback<void(std::unique_ptr<base::ListValue>)>& callback,
|
| + std::unique_ptr<base::ListValue> result) {
|
| callback.Run(std::move(result));
|
| }
|
|
|
| void GetFontListInBlockingPool(
|
| BrowserThread::ID calling_thread_id,
|
| - const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) {
|
| - scoped_ptr<base::ListValue> result(GetFontList_SlowBlocking());
|
| + const base::Callback<void(std::unique_ptr<base::ListValue>)>& callback) {
|
| + std::unique_ptr<base::ListValue> result(GetFontList_SlowBlocking());
|
| BrowserThread::PostTask(calling_thread_id, FROM_HERE,
|
| base::Bind(&ReturnFontListToOriginalThread, callback,
|
| base::Passed(&result)));
|
| @@ -34,7 +34,7 @@ void GetFontListInBlockingPool(
|
| } // namespace
|
|
|
| void GetFontListAsync(
|
| - const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) {
|
| + const base::Callback<void(std::unique_ptr<base::ListValue>)>& callback) {
|
| BrowserThread::ID id;
|
| bool well_known_thread = BrowserThread::GetCurrentThreadIdentifier(&id);
|
| DCHECK(well_known_thread)
|
|
|