extensions/browser/guest_view/extension_options/extension_options_apitest.cc - Issue 564993002: Embedded Extension Options: remove flags and trunk channel restrictions

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: extensions/browser/guest_view/extension_options/extension_options_apitest.cc

Issue 564993002: Embedded Extension Options: remove flags and trunk channel restrictions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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/renderer/extensions/chrome_extensions_dispatcher_delegate.cc ('k') | extensions/browser/guest_view/extension_options/extension_options_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/extension_options/extension_options_apitest.cc

diff --git a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc

index af98ead1b454a358d2dbb17f1aeb99ecbc2bbc19..bdd1cdc23243f4954f318e03900447c62f3bfa75 100644

--- a/extensions/browser/guest_view/extension_options/extension_options_apitest.cc

+++ b/extensions/browser/guest_view/extension_options/extension_options_apitest.cc

@@ -14,20 +14,6 @@ using extensions::Extension;

using extensions::FeatureSwitch;

class ExtensionOptionsApiTest : public ExtensionApiTest {

- private:

- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

- ExtensionApiTest::SetUpCommandLine(command_line);

- enable_options_.reset(new FeatureSwitch::ScopedOverride(

- FeatureSwitch::embedded_extension_options(), true));

- // Need to add a command line flag as well as a FeatureSwitch because the

- // FeatureSwitch is not copied over to the renderer process from the

- // browser process.

- command_line->AppendSwitch(

- extensions::switches::kEnableEmbeddedExtensionOptions);

- }

- scoped_ptr<FeatureSwitch::ScopedOverride> enable_options_;

};

IN_PROC_BROWSER_TEST_F(ExtensionOptionsApiTest, ExtensionCanEmbedOwnOptions) {