From 71b146746915bb5a1225038df3fa09feec2f6c6a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 26 May 2016 23:54:39 -0400
Subject: [PATCH] Backed out changesets 1cf7e08007f9 and 981fc919965e (bug
 1271777) for browser_ext_commands_onCommand.js failures.

---
 .../extensions/schemas/commands.json          |  2 +-
 .../browser/browser_ext_commands_onCommand.js | 78 +++++--------------
 2 files changed, 21 insertions(+), 59 deletions(-)

diff --git a/browser/components/extensions/schemas/commands.json b/browser/components/extensions/schemas/commands.json
index 1e8f15dab8f3..f9e9fc528b96 100644
--- a/browser/components/extensions/schemas/commands.json
+++ b/browser/components/extensions/schemas/commands.json
@@ -11,7 +11,7 @@
         "choices": [
           {
             "type": "string",
-            "pattern": "^\\s*(Alt|Ctrl|Command|MacCtrl)\\s*\\+\\s*(Shift\\s*\\+\\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\\s*$"
+            "pattern": "^\\s*(Alt|Ctrl|Command|MacCtr)\\s*\\+\\s*(Shift\\s*\\+\\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\\s*$"
           },
           {
             "type": "string",
diff --git a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
index ab51b3d7a9c0..73455660e8fb 100644
--- a/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
+++ b/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
@@ -2,55 +2,32 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-Cu.import("resource://gre/modules/AppConstants.jsm");
-
 add_task(function* test_user_defined_commands() {
   // Create a window before the extension is loaded.
   let win1 = yield BrowserTestUtils.openNewBrowserWindow();
   yield BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
   yield BrowserTestUtils.browserLoaded(win1.gBrowser.selectedBrowser);
 
-  let commands = {
-    "toggle-feature-using-alt-shift-3": {
-      "suggested_key": {
-        "default": "Alt+Shift+3",
-      },
-    },
-    "toggle-feature-using-control-shift-4": {
-      "suggested_key": {
-        "default": "Ctrl+Shift+4",
-      },
-    },
-    "toggle-feature-using-control-page-up": {
-      "suggested_key": {
-        "default": "Ctrl+PageUp",
-      },
-    },
-    "toggle-feature-using-alt-shift-comma": {
-      "suggested_key": {
-        "default": "Alt+Shift+Comma",
-      },
-      "unrecognized_property": "with-a-random-value",
-    },
-    "toggle-feature-with-whitespace-in-suggested-key": {
-      "suggested_key": {
-        "default": "  Alt + Shift + 2  ",
-      },
-    },
-  };
-
-  // Register the Mac OS-X specific commands.
-  if (AppConstants.platform == "macosx") {
-    commands["toggle-feature-using-mac-control-5"] = {
-      "suggested_key": {
-        "default": "MacCtrl+5",
-      },
-    };
-  }
-
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
-      "commands": commands,
+      "commands": {
+        "toggle-feature-using-alt-shift-3": {
+          "suggested_key": {
+            "default": "Alt+Shift+3",
+          },
+        },
+        "toggle-feature-using-alt-shift-comma": {
+          "suggested_key": {
+            "default": "Alt+Shift+Comma",
+          },
+          "unrecognized_property": "with-a-random-value",
+        },
+        "toggle-feature-with-whitespace-in-suggested-key": {
+          "suggested_key": {
+            "default": "  Alt + Shift + 2  ",
+          },
+        },
+      },
     },
 
     background: function() {
@@ -81,11 +58,11 @@ add_task(function* test_user_defined_commands() {
   let keysetID = `ext-keyset-id-${makeWidgetId(extension.id)}`;
   let keyset = win1.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 6, "Expected keyset to have the correct number of children");
+  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
 
   keyset = win2.document.getElementById(keysetID);
   ok(keyset != null, "Expected keyset to exist");
-  is(keyset.childNodes.length, 6, "Expected keyset to have the correct number of children");
+  is(keyset.childNodes.length, 3, "Expected keyset to have 3 children");
 
   // Confirm that the commands are registered to both windows.
   yield focusWindow(win1);
@@ -93,21 +70,6 @@ add_task(function* test_user_defined_commands() {
   let message = yield extension.awaitMessage("oncommand");
   is(message, "toggle-feature-using-alt-shift-3", "Expected onCommand listener to fire with correct message");
 
-  EventUtils.synthesizeKey("4", {accelKey: true, shiftKey: true});
-  message = yield extension.awaitMessage("oncommand");
-  is(message, "toggle-feature-using-control-shift-4", "Expected onCommand listener to fire with correct message");
-
-  EventUtils.synthesizeKey("VK_PAGE_UP", {accelKey: true});
-  message = yield extension.awaitMessage("oncommand");
-  is(message, "toggle-feature-using-control-page-up", "Expected onCommand listener to fire with correct message");
-
-  // Test the Mac OS-X specific shortcut.
-  if (AppConstants.platform == "macosx") {
-    EventUtils.synthesizeKey("5", {ctrlKey: true});
-    message = yield extension.awaitMessage("oncommand");
-    is(message, "toggle-feature-using-mac-control-5", "Expected onCommand listener to fire with correct message");
-  }
-
   yield focusWindow(win2);
   EventUtils.synthesizeKey("VK_COMMA", {altKey: true, shiftKey: true});
   message = yield extension.awaitMessage("oncommand");