chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc - Issue 9834056: Moved WebDataService to 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 9834056: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changed return NULL; to NOTREACHED() Created 8 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/autofill_helper.cc ('k') | chrome/browser/ui/intents/web_intents_model_unittest.cc » ('j') | chrome/browser/webdata/web_data_service_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

index 96c2382db0cbade72b0ca8dde8d7e9ef79b17f01..c08e3be4831716f4d16f6f54a0147220aac21e3d 100644

--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

@@ -20,6 +20,7 @@

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

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

#include "chrome/browser/webdata/web_data_service.h"

+#include "chrome/browser/webdata/web_data_service_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

#include "chrome/test/base/in_process_browser_test.h"

@@ -215,8 +216,8 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {

fake_url_fetcher_factory_.reset(

new FakeURLFetcherFactory(default_url_fetcher_factory_.get()));

- web_data_service_ =

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

+ web_data_service_ = WebDataServiceFactory::GetForProfile(

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

favicon_service_ =

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

controller_ = GetBrowser()->

@@ -293,7 +294,7 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {

}

WebIntentPickerMock picker_;

- WebDataService* web_data_service_;

+ scoped_refptr<WebDataService> web_data_service_;

FaviconService* favicon_service_;

WebIntentPickerController* controller_;

scoped_ptr<DummyURLFetcherFactory> default_url_fetcher_factory_;