Disable EnterToSearch on Windows

chrome/browser/ui/omnibox/omnibox_view_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.
 
 #include <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 1345 matching lines @@
 #endif
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLD) {
   DesiredTLDTest();
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, AltEnter) {
   AltEnterTest();
 }
 
-// http://crbug.com/133354
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-#define MAYBE_EnterToSearch DISABLED_EnterToSearch
-#else
-#define MAYBE_EnterToSearch EnterToSearch
-#endif
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EnterToSearch) {
+// http://crbug.com/133354, http://crbug.com/146953
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_EnterToSearch) {
   EnterToSearchTest();
 }
 
 // http://crbug.com/131179
 #if defined(OS_LINUX)
 #define MAYBE_EscapeToDefaultMatch DISABLED_EscapeToDefaultMatch
 #else
 #define MAYBE_EscapeToDefaultMatch EscapeToDefaultMatch
 #endif
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EscapeToDefaultMatch) {
@@ skipping 287 matching lines @@
 
   // Middle-clicking shouldn't select all the text either.
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset));
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif  // defined(USE_AURA)