Remove more non-aura windows code.

chrome/browser/ui/views/keyboard_access_browsertest.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.
 
 // This functionality currently works on Windows and on Linux when
 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
 // on the Mac, and it's not yet implemented on Linux.
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 345 matching lines @@
 #if defined(OS_WIN)
 #define MAYBE_TestShiftAltMenuKeyboardAccess DISABLED_TestShiftAltMenuKeyboardAccess
 #else
 #define MAYBE_TestShiftAltMenuKeyboardAccess TestShiftAltMenuKeyboardAccess
 #endif
 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest,
                        MAYBE_TestShiftAltMenuKeyboardAccess) {
   TestMenuKeyboardAccess(true, true, false);
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest,

[scottmg, 2014/01/14 21:12:37]

these work on aura now?

[jam, 2014/01/14 21:54:32]

oops, I meant to leave these disabled but still in the code

                        TestAltMenuKeyboardAccessFocusOmnibox) {
   TestMenuKeyboardAccess(true, false, true);
 }
 
 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestSystemMenuWithKeyboard) {
   TestSystemMenuWithKeyboard();
 }
 #endif
 
-#if !defined(OS_WIN) && defined(USE_AURA)

[scottmg, 2014/01/14 22:00:24]

this one is !WIN && AURA, so probably leave that?

[jam, 2014/01/14 22:24:12]

Done.

+#if !defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) {
   TestMenuKeyboardAccessAndDismiss();
 }
 #endif
 
 // Test that JavaScript cannot intercept reserved keyboard accelerators like
 // ctrl-t to open a new tab or ctrl-f4 to close a tab.
 // TODO(isherman): This test times out on ChromeOS.  We should merge it with
 // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
 // If this flakes, use http://crbug.com/62311.
@@ skipping 47 matching lines @@
       browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false));
 
   base::string16 after_forward;
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward));
 
   EXPECT_EQ(before_back, after_forward);
 }
 #endif
 
 }  // namespace