wip: Add ui::EventType parameter.

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/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class CommandTest : public testing::Test {
 };
 
 TEST(CommandTest, ExtensionCommandParsing) {
   const ui::Accelerator none = ui::Accelerator();
   const ui::Accelerator shift_f = ui::Accelerator(ui::VKEY_F,
-                                                  ui::EF_SHIFT_DOWN);
+                                                  ui::EF_SHIFT_DOWN,
+                                                  ui::ET_KEY_PRESSED);
   const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F,
-                                                ui::EF_CONTROL_DOWN);
-  const ui::Accelerator alt_f = ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN);
+                                                 ui::EF_CONTROL_DOWN,
+                                                 ui::ET_KEY_PRESSED);
+  const ui::Accelerator alt_f = ui::Accelerator(ui::VKEY_F,
+                                                ui::EF_ALT_DOWN,
+                                                ui::ET_KEY_PRESSED);
   const ui::Accelerator ctrl_shift_f =
-      ui::Accelerator(ui::VKEY_F, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
+      ui::Accelerator(ui::VKEY_F,
+                      ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+                      ui::ET_KEY_PRESSED);
   const ui::Accelerator alt_shift_f =
-      ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN);
+      ui::Accelerator(ui::VKEY_F,
+                      ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
+                      ui::ET_KEY_PRESSED);
 
   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 96 matching lines @@
 
   extensions::Command command;
   string16 error;
   EXPECT_TRUE(command.Parse(input.get(), command_name, 0, &error));
   EXPECT_STREQ(description.c_str(),
                UTF16ToASCII(command.description()).c_str());
   EXPECT_STREQ(command_name.c_str(), command.command_name().c_str());
 
 #if defined(OS_WIN)
   ui::Accelerator accelerator(ui::VKEY_W,
-                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                              ui::ET_KEY_PRESSED);
 #elif defined(OS_MACOSX)
   ui::Accelerator accelerator(ui::VKEY_M,
-                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                              ui::ET_KEY_PRESSED);
 #elif defined(OS_CHROMEOS)
   ui::Accelerator accelerator(ui::VKEY_C,
-                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                              ui::ET_KEY_PRESSED);
 #elif defined(OS_LINUX)
   ui::Accelerator accelerator(ui::VKEY_L,
-                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                              ui::ET_KEY_PRESSED);
 #else
   ui::Accelerator accelerator(ui::VKEY_D,
-                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                              ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                              ui::ET_KEY_PRESSED);
 #endif
   EXPECT_EQ(accelerator, command.accelerator());
 
   // Misspell a platform.
   key_dict->SetString("windosw", "Ctrl+M");
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
   EXPECT_TRUE(key_dict->Remove("windosw", NULL));
 
   // Now remove platform specific keys (leaving just "default") and make sure
   // every platform falls back to the default.
@@ skipping 19 matching lines @@
   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));
   key_dict->SetString("windows", "Options+Shift+M");
   EXPECT_FALSE(command.Parse(input.get(), command_name, 0, &error));
 #endif
 }