| Index: chrome/browser/bookmarks/bookmark_model.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
|
| index c8941a6c6a49490003e870dcabdf60210d09e3f8..84793e0c5c73a9d2d5d18c5d16fb552dcf203464 100644
|
| --- a/chrome/browser/bookmarks/bookmark_model.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_model.cc
|
| @@ -1015,14 +1015,15 @@ void BookmarkModel::LoadFavicon(BookmarkNode* node) {
|
| profile_, Profile::EXPLICIT_ACCESS);
|
| if (!favicon_service)
|
| return;
|
| - FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(
|
| - FaviconService::FaviconForURLParams(node->url(),
|
| - chrome::FAVICON,
|
| - gfx::kFaviconSize),
|
| - base::Bind(&BookmarkModel::OnFaviconDataAvailable,
|
| - base::Unretained(this), node),
|
| - &cancelable_task_tracker_);
|
| - node->set_favicon_load_task_id(handle);
|
| + base::CancelableTaskTracker::TaskId taskId =
|
| + favicon_service->GetFaviconImageForURL(
|
| + FaviconService::FaviconForURLParams(
|
| + node->url(), chrome::FAVICON, gfx::kFaviconSize),
|
| + base::Bind(&BookmarkModel::OnFaviconDataAvailable,
|
| + base::Unretained(this),
|
| + node),
|
| + &cancelable_task_tracker_);
|
| + node->set_favicon_load_task_id(taskId);
|
| }
|
|
|
| void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {
|
|
|