Parse media keys for named command in the manifest.

chrome/common/extensions/command_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/command.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 25 matching lines @@
   const ui::Accelerator ctrl_left = ui::Accelerator(ui::VKEY_LEFT, ctrl);
   const ui::Accelerator ctrl_right = ui::Accelerator(ui::VKEY_RIGHT, ctrl);
   const ui::Accelerator ctrl_up = ui::Accelerator(ui::VKEY_UP, ctrl);
   const ui::Accelerator ctrl_down = ui::Accelerator(ui::VKEY_DOWN, ctrl);
   const ui::Accelerator ctrl_ins = ui::Accelerator(ui::VKEY_INSERT, ctrl);
   const ui::Accelerator ctrl_del = ui::Accelerator(ui::VKEY_DELETE, ctrl);
   const ui::Accelerator ctrl_home = ui::Accelerator(ui::VKEY_HOME, ctrl);
   const ui::Accelerator ctrl_end = ui::Accelerator(ui::VKEY_END, ctrl);
   const ui::Accelerator ctrl_pgup = ui::Accelerator(ui::VKEY_PRIOR, ctrl);
   const ui::Accelerator ctrl_pgdwn = ui::Accelerator(ui::VKEY_NEXT, ctrl);
+  const ui::Accelerator next_track =
+      ui::Accelerator(ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE);
+  const ui::Accelerator prev_track =
+      ui::Accelerator(ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE);
+  const ui::Accelerator play_pause =
+      ui::Accelerator(ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE);
+  const ui::Accelerator stop =
+      ui::Accelerator(ui::VKEY_MEDIA_STOP, ui::EF_NONE);
 
   const struct {
     bool expected_result;
     ui::Accelerator accelerator;
     const char* command_name;
     const char* key;
     const char* description;
   } kTests[] = {
     // Negative test (one or more missing required fields). We don't need to
     // test |command_name| being blank as it is used as a key in the manifest,
@@ skipping 37 matching lines @@
     { true, ctrl_left, "_execute_browser_action", "Ctrl+Left", "" },
     { true, ctrl_right, "_execute_browser_action", "Ctrl+Right", "" },
     { true, ctrl_up, "_execute_browser_action", "Ctrl+Up", "" },
     { true, ctrl_down, "_execute_browser_action", "Ctrl+Down", "" },
     { true, ctrl_ins, "_execute_browser_action", "Ctrl+Insert", "" },
     { true, ctrl_del, "_execute_browser_action", "Ctrl+Delete", "" },
     { true, ctrl_home, "_execute_browser_action", "Ctrl+Home", "" },
     { true, ctrl_end, "_execute_browser_action", "Ctrl+End", "" },
     { true, ctrl_pgup, "_execute_browser_action", "Ctrl+PageUp", "" },
     { true, ctrl_pgdwn, "_execute_browser_action", "Ctrl+PageDown", "" },
+    // Media keys.
+    { true, next_track, "command", "MediaNextTrack", "description"},
+    { true, play_pause, "command", "MediaPlayPause", "description"},
+    { true, prev_track, "command", "MediaPrevTrack", "description"},
+    { true, stop, "command", "MediaStop", "description"},
+    { false, none, "_execute_browser_action", "MediaNextTrack", ""},
+    { false, none, "_execute_page_action", "MediaPrevTrack", ""},

[Finnur, 2013/08/28 14:15:16]

Add a failure test for Ctrl+Shift+MediaKey (one permutation should be enough).

[zhchbin, 2013/08/29 14:27:11]

Done.

   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) {
     // First parse the command as a simple string.
     scoped_ptr<base::DictionaryValue> input(new base::DictionaryValue);
     input->SetString("suggested_key", kTests[i].key);
     input->SetString("description", kTests[i].description);
 
     SCOPED_TRACE(std::string("Command name: |") + kTests[i].command_name +
                  "| key: |" + kTests[i].key +
@@ skipping 112 matching lines @@
   key_dict->SetString("windows", "Ctrl+Shift+W");
 #endif
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 
   // Make sure Mac specific keys are not processed on other platforms.
 #if !defined(OS_MACOSX)
   key_dict->SetString("windows", "Command+Shift+M");
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 #endif
 }