Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2039)

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: make the default stable 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
« no previous file with comments | « chrome/common/extensions/features/feature_unittest.cc ('k') | chrome/renderer/extensions/dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..6d46479325b1e39b856e89bc01e9e077d842c8d1 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_DEV);
std::string error;
scoped_ptr<DictionaryValue> manifest(
« no previous file with comments | « chrome/common/extensions/features/feature_unittest.cc ('k') | chrome/renderer/extensions/dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698