chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 1862513003: Remove NPAPI from browser and utility

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/api/content_settings/content_settings_apitest.cc

Issue 1862513003: Remove NPAPI from browser and utility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/download/download_target_determiner_unittest.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index 3867baa3e67664580a55279058135f2109d0f274..f275e0f51e0b0f919786e8f426eb2cb4ff9ee6ab 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -36,11 +36,6 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {

public:

ExtensionContentSettingsApiTest() : profile_(NULL) {}

- void SetUpCommandLine(base::CommandLine* command_line) override {

- ExtensionApiTest::SetUpCommandLine(command_line);

- command_line->AppendSwitch(switches::kDisablePluginsDiscovery);

- }

void SetUpOnMainThread() override {

ExtensionApiTest::SetUpOnMainThread();