Merge Chromium src@r53293

Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34

1 files changed, 27 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm
new file mode 100644
index 0000000..cac5c20
--- /dev/null
+++ b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm
@@ -0,0 +1,27 @@
+// Copyright (c) 2010 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.
+
+#import <Cocoa/Cocoa.h>
+
+#include "app/menus/accelerator_cocoa.h"
+#include "base/singleton.h"
+#include "chrome/app/chrome_dll_resource.h"
+#import "chrome/browser/cocoa/accelerators_cocoa.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+TEST(AcceleratorsCocoaTest, GetAccelerator) {
+  AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get();
+  const menus::AcceleratorCocoa* accelerator =
+      keymap->GetAcceleratorForCommand(IDC_COPY);
+  ASSERT_TRUE(accelerator);
+  EXPECT_TRUE([@"c" isEqualToString:accelerator->characters()]);
+  EXPECT_EQ(NSCommandKeyMask, accelerator->modifiers());
+}
+
+TEST(AcceleratorsCocoaTest, GetNullAccelerator) {
+  AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get();
+  const menus::AcceleratorCocoa* accelerator =
+      keymap->GetAcceleratorForCommand(314159265);
+  EXPECT_FALSE(accelerator);
+}