chrome/browser/sync/test/integration/sync_extension_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_extension_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/test/integration/sync_app_helper.cc ('k') | chrome/browser/translate/translate_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 39e6298cc273ba06a5eab6dd066765162640d49b..a22b3335bd1b3841ecaebd405a5c5cb464a79b66 100644

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

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

@@ -9,6 +9,8 @@

#include "base/logging.h"

#include "base/values.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/pending_extension_info.h"

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

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

@@ -239,7 +241,7 @@ bool SyncExtensionHelper::ExtensionStatesMatch(

}

void SyncExtensionHelper::SetupProfile(Profile* profile) {

- profile->InitExtensions(true);

+ ExtensionSystemFactory::GetForProfile(profile)->Init(true);

profile_extensions_.insert(make_pair(profile, ExtensionNameMap()));

}