chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc - Issue 10873022: Revert 152904 - 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/intents/web_intent_picker_controller_browsertest.cc

Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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/intents/web_intent_picker_controller_browsertest.cc

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

--- chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc (revision 152958)

+++ chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc (working copy)

@@ -13,7 +13,6 @@

#include "base/stringprintf.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/favicon/favicon_service.h"

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

#include "chrome/browser/intents/default_web_intent_service.h"

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

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

@@ -238,8 +237,8 @@

web_data_service_ = WebDataServiceFactory::GetForProfile(

GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);

- favicon_service_ = FaviconServiceFactory::GetForProfile(

- GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);

+ favicon_service_ =

+ GetBrowser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);

controller_ = chrome::GetActiveTabContents(GetBrowser())->

web_intent_picker_controller();