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

Unified Diff: chrome/common/extensions/api/commands/commands_manifest_unittest.cc

Issue 253593003: Release the Commands API and add docs for Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 6 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
Index: chrome/common/extensions/api/commands/commands_manifest_unittest.cc
diff --git a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
index 8837e531250ee2cacc4a3ad01765d23f0d4fdef7..bb875959073cba9c9389227363027e86b726cc62 100644
--- a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
+++ b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
@@ -97,41 +97,16 @@ TEST_F(CommandsManifestTest, BrowserActionSynthesizesCommand) {
}
// This test makes sure that the "commands" feature and the "commands.global"
-// property behave as expected on dev and stable (enabled and working on dev,
-// not working on stable).
-TEST_F(CommandsManifestTest, ChannelTests) {
- // This tests the following combinations.
- // Ext+Command Stable : OK.
- // Ext+Command+Global Stable : Property is silently ignored (expect success).
- // App+Command Stable : NOT OK.
- // App+Command+Global Stable : NOT OK.
- {
- std::string warning = "'commands' requires Google Chrome dev channel or "
- "newer, but this is the stable channel.";
- ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
- scoped_refptr<Extension> extension1 =
- LoadAndExpectSuccess("command_ext.json");
- scoped_refptr<Extension> extension2 =
- LoadAndExpectSuccess("command_ext_global.json");
- LoadAndExpectWarning("command_app.json", warning);
- LoadAndExpectWarning("command_app_global.json", warning);
- }
-
- // Ext+Command Dev : OK.
- // App+Command Dev : OK.
- // Ext+Command+Global Dev : OK.
- // App+Command+Global Dev : OK.
- {
- ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV);
- scoped_refptr<Extension> extension1 =
- LoadAndExpectSuccess("command_ext.json");
- scoped_refptr<Extension> extension2 =
- LoadAndExpectSuccess("command_app.json");
- scoped_refptr<Extension> extension3 =
- LoadAndExpectSuccess("command_ext_global.json");
- scoped_refptr<Extension> extension4 =
- LoadAndExpectSuccess("command_app_global.json");
- }
+// property load properly.
+TEST_F(CommandsManifestTest, LoadsOnStable) {
+ scoped_refptr<Extension> extension1 =
+ LoadAndExpectSuccess("command_ext.json");
+ scoped_refptr<Extension> extension2 =
+ LoadAndExpectSuccess("command_app.json");
+ scoped_refptr<Extension> extension3 =
+ LoadAndExpectSuccess("command_ext_global.json");
+ scoped_refptr<Extension> extension4 =
+ LoadAndExpectSuccess("command_app_global.json");
}
TEST_F(CommandsManifestTest, CommandManifestShouldNotCountMediaKeys) {

Powered by Google App Engine
This is Rietveld 408576698