chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc - Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the

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/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

Issue 10826199: Properly propagate the current Chrome channel into the Feature system on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 8 years, 4 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

« chrome/common/extensions/features/feature.h ('K') | « chrome/common/extensions/features/feature_unittest.cc ('k') | chrome/renderer/extensions/dispatcher.h » ('j') | chrome/renderer/extensions/dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

index 874ee8c16fb95339d634fe5c7e7557dc5d8895ae..e1ce3026691f05d409bc9ba6cf20e40bb40ebc97 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

@@ -89,7 +89,8 @@ TEST_F(ExtensionManifestTest, BackgroundAllowNoJsAccess) {

TEST_F(ExtensionManifestTest, BackgroundPageWebRequest) {

CommandLine::ForCurrentProcess()->AppendSwitch(

switches::kEnableExperimentalExtensionApis);

- Feature::SetChannelForTesting(chrome::VersionInfo::CHANNEL_UNKNOWN);

+ Feature::ScopedCurrentChannel current_channel(

+ chrome::VersionInfo::CHANNEL_UNKNOWN);

std::string error;

scoped_ptr<DictionaryValue> manifest(