chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc - Issue 10828263: Moving FaviconService to a ProfileKeyedService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc

Issue 10828263: Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: resyncing with library after revert Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc

===================================================================

--- chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc (revision 152993)

+++ chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc (working copy)

@@ -8,6 +8,7 @@

#include "base/string16.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

+#include "chrome/browser/favicon/favicon_service_factory.h"

#include "chrome/browser/history/history.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -529,8 +530,9 @@

HistoryServiceFactory::GetForProfile(

profile(), Profile::EXPLICIT_ACCESS)->AddPage(

url1, history::SOURCE_BROWSED);

- profile()->GetFaviconService(Profile::EXPLICIT_ACCESS)->SetFavicon(url1,

- url1_favicon, icon_data, history::FAVICON);

+ FaviconServiceFactory::GetForProfile(

+ profile(), Profile::EXPLICIT_ACCESS)->SetFavicon(

+ url1, url1_favicon, icon_data, history::FAVICON);

// Will return the current icon (default) but start an anync call

// to retrieve the favicon from the favicon service.