webkit/tools/test_shell/test_shell.gypi - Issue 5699005: Policy: Re-enabled plugin still disabled

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: webkit/tools/test_shell/test_shell.gypi

Issue 5699005: Policy: Re-enabled plugin still disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Forgotten to upload the mergeconflict resolutions (trybots happiness aplies to this upload). Created 9 years, 11 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:

Index: webkit/tools/test_shell/test_shell.gypi

diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi

index 9a6e7a747dd6e1bd535e0e5ffb9897b504312f8a..a83f84692470ec2aaac885103faad16e6fc57b81 100644

--- a/webkit/tools/test_shell/test_shell.gypi

+++ b/webkit/tools/test_shell/test_shell.gypi

@@ -412,6 +412,7 @@

'../../mocks/mock_weburlloader.h',

'../../plugins/npapi/plugin_group_unittest.cc',

'../../plugins/npapi/plugin_lib_unittest.cc',

+ '../../plugins/npapi/plugin_list_unittest.cc',

'../../plugins/npapi/webplugin_impl_unittest.cc',

'../../plugins/ppapi/callbacks_unittest.cc',

'../../plugins/ppapi/mock_plugin_delegate.cc',