MacViews: Fix BrowserViewTest.RepeatedAccelerators.

chrome/browser/ui/views/frame/browser_view_unittest.cc

 // Copyright 2013 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/browser/ui/views/frame/browser_view.h"
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/webview/webview.h"
 
 namespace {
 
+#if defined(OS_MACOSX)
+const ui::EventFlags kPlatformModifier = ui::EF_COMMAND_DOWN;
+#else
+const ui::EventFlags kPlatformModifier = ui::EF_CONTROL_DOWN;
+#endif  // OS_MACOSX
+
 // Tab strip bounds depend on the window frame sizes.
 gfx::Point ExpectedTabStripOrigin(BrowserView* browser_view) {
   gfx::Rect tabstrip_bounds(
       browser_view->frame()->GetBoundsForTabStrip(browser_view->tabstrip()));
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   views::View::ConvertPointToTarget(browser_view->parent(),
                                     browser_view,
                                     &tabstrip_origin);
   return tabstrip_origin;
 }
@@ skipping 125 matching lines @@
             browser_view()->GetIndexOf(top_container));
 
   BookmarkBarView::DisableAnimationsForTesting(false);
 }
 
 // Test that repeated accelerators are processed or ignored depending on the
 // commands that they refer to. The behavior for different commands is dictated
 // by IsCommandRepeatable() in chrome/browser/ui/views/accelerator_table.h.
 TEST_F(BrowserViewTest, RepeatedAccelerators) {
   // A non-repeated Ctrl-L accelerator should be processed.
-  const ui::Accelerator kLocationAccel(ui::VKEY_L, ui::EF_CONTROL_DOWN);
+  const ui::Accelerator kLocationAccel(ui::VKEY_L, kPlatformModifier);
   EXPECT_TRUE(browser_view()->AcceleratorPressed(kLocationAccel));
 
   // If the accelerator is repeated, it should be ignored.
   const ui::Accelerator kLocationRepeatAccel(
-      ui::VKEY_L, ui::EF_CONTROL_DOWN | ui::EF_IS_REPEAT);
+      ui::VKEY_L, kPlatformModifier | ui::EF_IS_REPEAT);
   EXPECT_FALSE(browser_view()->AcceleratorPressed(kLocationRepeatAccel));
 
   // A repeated Ctrl-Tab accelerator should be processed.
   const ui::Accelerator kNextTabRepeatAccel(
       ui::VKEY_TAB, ui::EF_CONTROL_DOWN | ui::EF_IS_REPEAT);
   EXPECT_TRUE(browser_view()->AcceleratorPressed(kNextTabRepeatAccel));
 }
 
 class BrowserViewHostedAppTest : public TestWithBrowserView {
  public:
@@ skipping 30 matching lines @@
       header_offset.y();
 
   // The web contents should be flush with the bottom of the header.
   EXPECT_EQ(bottom_of_header, contents_container->y());
 
   // The find bar should overlap the 1px header/web-contents separator at the
   // bottom of the header.
   EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(),
             browser_view()->frame()->GetTopInset(false));
 }