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

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifest_test.h

Issue 10826298: Force the channel to be dev for active tab and manfiest unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/common/extensions/manifest_tests/extension_manifest_test.h
diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
index 7f2766ee3d3a8bded5c7cc34b1112e3a1de1ac0a..2e38514e055f4b389467fe5b0a3c6cd079cd07a0 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h
+++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h
@@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/features/feature.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace errors = extension_manifest_errors;
@@ -135,6 +136,14 @@ class ExtensionManifestTest : public testing::Test {
EXPECT_TYPE type);
bool enable_apps_;
+
+ // Force the manifest tests to run as though it were dev channel, since
+ // several tests rely on manifest features being available that aren't
+ // on stable/beta.
+ //
+ // These objects nest, so if a test wants to explicitly test the behaviour
+ // on stable or beta, declare it inside that test.
+ extensions::Feature::ScopedCurrentChannel current_channel_;
};
#endif // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
« no previous file with comments | « chrome/browser/extensions/active_tab_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifest_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698