chrome/browser/extensions/extension_system_impl.cc - Issue 1250473002: Fix content verifier problem with content scripts (reland)

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/extensions/extension_system_impl.cc

Issue 1250473002: Fix content verifier problem with content scripts (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed logging and reworked test to elimnate flakiness Created 5 years, 5 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/extensions/extension_browsertest.cc ('k') | chrome/test/data/extensions/content_verifier/content_script.crx » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_system_impl.cc

diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc

index b4ef0d9358568e5c40599f6932b797dc3fa445d1..658b9aa2543fd309faec353bb941106d56b03e09 100644

--- a/chrome/browser/extensions/extension_system_impl.cc

+++ b/chrome/browser/extensions/extension_system_impl.cc

@@ -135,6 +135,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {

bool allow_noisy_errors = !command_line->HasSwitch(switches::kNoErrorDialogs);

ExtensionErrorReporter::Init(allow_noisy_errors);

+ content_verifier_ = new ContentVerifier(

+ profile_, new ChromeContentVerifierDelegate(profile_));

shared_user_script_master_.reset(new SharedUserScriptMaster(profile_));

// ExtensionService depends on RuntimeData.

@@ -156,8 +159,6 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {

// load any extensions.

{

InstallVerifier::Get(profile_)->Init();

- content_verifier_ = new ContentVerifier(

- profile_, new ChromeContentVerifierDelegate(profile_));

ContentVerifierDelegate::Mode mode =

ChromeContentVerifierDelegate::GetDefaultMode();

#if defined(OS_CHROMEOS)