chrome/browser/sync/test/integration/sync_app_helper.cc - Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

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/sync/test/integration/sync_app_helper.cc

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rerebase Created 8 years, 10 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/profile_sync_service_factory.cc ('k') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/sync_app_helper.cc

diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc

index a2864beef3c6d3efe2e8b8604527414876c126d9..d784bdfaa74793aced9738d46a8f9833c0b5dbe2 100644

--- a/chrome/browser/sync/test/integration/sync_app_helper.cc

+++ b/chrome/browser/sync/test/integration/sync_app_helper.cc

@@ -5,6 +5,8 @@

#include "chrome/browser/sync/test/integration/sync_app_helper.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/extension_system.h"

+#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/extension_sorting.h"

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

#include "chrome/browser/sync/test/integration/extensions_helper.h"

@@ -90,9 +92,9 @@ void SyncAppHelper::SetupIfNecessary(SyncTest* test) {

return;

for (int i = 0; i < test->num_clients(); ++i) {

- test->GetProfile(i)->InitExtensions(true);

+ ExtensionSystemFactory::GetForProfile(test->GetProfile(i))->Init(true);

}

- test->verifier()->InitExtensions(true);

+ ExtensionSystemFactory::GetForProfile(test->verifier())->Init(true);

setup_completed_ = true;

}