Preference for Presentation Mode/Fullscreen Toolbar

chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm

 // Copyright 2014 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 "base/logging.h"
+#include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 typedef InProcessBrowserTest AcceleratorsCocoaBrowserTest;
 
 namespace {
 
@@ skipping 102 matching lines @@
             it->second.platform_accelerator());
 
     // Check that there exists a corresponding NSMenuItem.
     NSMenuItem* item =
         MenuContainsAccelerator([NSApp mainMenu],
                                 platform_accelerator->characters(),
                                 platform_accelerator->modifier_mask());
     EXPECT_TRUE(item);
 
     // If the menu uses a commandDispatch:, the tag must match the command id!
-    if (item.action == @selector(commandDispatch:))
+    // Added an exception for IDC_TOGGLE_FULLSCREEN_TOOLBAR, which conflicts
+    // with IDC_PRESENTATION_MODE.
+    if (item.action == @selector(commandDispatch:)
+        && item.tag != IDC_TOGGLE_FULLSCREEN_TOOLBAR)
       EXPECT_EQ(item.tag, it->first);
   }
 }