Polish the keybinding implementation a bit.

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 952 matching lines @@
     { true, CtrlF,      "command", "F+Ctrl",       "description" },
     { true, ShiftF,     "command", "F+Shift",      "description" },
     { true, AltF,       "command", "F+Alt",        "description" },
     { true, CtrlShiftF, "command", "F+Ctrl+Shift", "description" },
     { true, CtrlShiftF, "command", "F+Shift+Ctrl", "description" },
     { true, AltShiftF,  "command", "F+Alt+Shift",  "description" },
     { true, AltShiftF,  "command", "F+Shift+Alt",  "description" },
     // Case insensitivity is OK.
     { true, CtrlF, "command", "Ctrl+F", "description" },
     { true, CtrlF, "command", "cTrL+f", "description" },
-    // Extra spaces are fine.
-    { true, CtrlShiftF, "command", "  Ctrl + Shift   +F", "description" },
-    // Minus is equivalent to plus.
-    { true, CtrlShiftF, "command", "Ctrl+Shift-F", "description" },
     // Skipping description is OK for browser- and pageActions.
-    { true, CtrlF, "browserAction", "Ctrl+F", "" },
-    { true, CtrlF, "pageAction",    "Ctrl+F", "" },
+    { true, CtrlF, "_execute_browser_action", "Ctrl+F", "" },
+    { true, CtrlF, "_execute_page_action",   "Ctrl+F", "" },
   };
 
   // TODO(finnur): test Command/Options on Mac when implemented.
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) {
     scoped_ptr<DictionaryValue> command(new DictionaryValue);
-    command->SetString("key", kTests[i].key);
+    command->SetString("suggested_key_win", kTests[i].key);
+    command->SetString("suggested_key_mac", kTests[i].key);
+    command->SetString("suggested_key_other", kTests[i].key);
     command->SetString("description", kTests[i].description);
 
     Extension::ExtensionKeybinding keybinding;
     string16 error;
     bool result =
         keybinding.Parse(command.get(), kTests[i].command_name, i, &error);
 
     SCOPED_TRACE(std::string("Command name: |") + kTests[i].command_name +
                  "| key: |" + kTests[i].key +
                  "| description: |" + kTests[i].description +
@@ skipping 20 matching lines @@
 }
 
 TEST(ExtensionTest, GetSyncTypeExtensionWithTwoPlugins) {
   scoped_refptr<Extension> extension(
       MakeSyncTestExtension(EXTENSION, GURL(), GURL(),
                             Extension::INTERNAL, 2, FilePath()));
   if (extension)
     EXPECT_EQ(extension->GetSyncType(), Extension::SYNC_TYPE_NONE);
 }
 #endif // !defined(OS_CHROMEOS)