Chromium Code Reviews| Index: chrome/browser/favicon/favicon_service.cc |
| diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc |
| index 9f0ff332cd1a5fe2e1caa498497ff1eb9ec0a895..0428f2ef5a13717f54eb17e43c59508b340532cb 100644 |
| --- a/chrome/browser/favicon/favicon_service.cc |
| +++ b/chrome/browser/favicon/favicon_service.cc |
| @@ -63,8 +63,10 @@ CancelableTaskTracker::TaskId GetFaviconForChromeURL( |
| } // namespace |
| -FaviconService::FaviconService(HistoryService* history_service) |
| - : history_service_(history_service) { |
| +FaviconService::FaviconService(Profile* profile) |
| + : profile_(profile) { |
| + history_service_.reset( |
|
sky
2013/11/01 20:06:07
Isn't the HistoryService owned by BrowserContextKe
michaelbai
2013/11/01 20:22:13
Yes, the HistoryServiceFactory is the subclass of
sky
2013/11/01 20:29:25
It's not the getting that I think is wrong. It's t
michaelbai
2013/11/01 20:59:01
Done.
|
| + HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS)); |
| } |
| // static |
| @@ -323,7 +325,7 @@ CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl( |
| CancelableTaskTracker* tracker) { |
| if (params.page_url.SchemeIs(chrome::kChromeUIScheme) || |
| params.page_url.SchemeIs(extensions::kExtensionScheme)) { |
| - return GetFaviconForChromeURL(params.profile, params.page_url, |
| + return GetFaviconForChromeURL(profile_, params.page_url, |
| desired_scale_factors, callback, tracker); |
| } else if (history_service_) { |
| return history_service_->GetFaviconsForURL(params.page_url, |