chrome/browser/search_engines/template_url_service_sync_unittest.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/search_engines/template_url_service_sync_unittest.cc

Issue 9834056: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments, fixed bug 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/search_engines/template_url_service_factory.cc ('k') | chrome/browser/search_engines/template_url_service_test_util.cc » ('j') | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc

diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

index 3bad1bc0657889ddaf62246a113e24369f210851..ff3ef1fbe54a225d132a7e56e9b6f2aec60fcc08 100644

--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc

+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

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

@@ -160,11 +161,15 @@ class TemplateURLServiceSyncTest : public testing::Test {

virtual void SetUp() {

profile_a_.reset(new TestingProfile);

+ WebDataServiceFactory::GetInstance()->SetTestingFactory(profile_a_.get(),

+ NULL);

TemplateURLServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

profile_a_.get());

model_a_.reset(new TemplateURLService(profile_a_.get()));

model_a_->Load();

profile_b_.reset(new TestingProfile);

+ WebDataServiceFactory::GetInstance()->SetTestingFactory(profile_b_.get(),

+ NULL);

TemplateURLServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

profile_b_.get());

model_b_.reset(new TemplateURLService(profile_b_.get()));