Disable InstantTest.OnSubmitEvent instead of OnChangeEvent...

chrome/browser/instant/instant_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 144 matching lines @@
   TabContents* preview_;
 };
 
 // TODO(tonyg): Add the following tests:
 // 1. Test that setSuggestions() works.
 // 2. Test that the search box API is not populated for pages other than the
 //    default search provider.
 // 3. Test resize events.
 
 #if defined(OS_WIN)
-// Disabled, http://crbug.com/62940.
-#define MAYBE_OnChangeEvent DISABLED_OnChangeEvent
+#define MAYBE_OnChangeEvent OnChangeEvent
 #else
 #define MAYBE_OnChangeEvent DISABLED_OnChangeEvent
 #endif
 // Verify that the onchange event is dispatched upon typing in the box.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_OnChangeEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Check that the value is reflected and onchange is called.
   EXPECT_NO_FATAL_FAILURE(CheckStringValueFromJavascript(
       "abc", "window.chrome.searchBox.value", preview_));
   EXPECT_NO_FATAL_FAILURE(CheckBoolValueFromJavascript(
       false, "window.chrome.searchBox.verbatim", preview_));
   EXPECT_NO_FATAL_FAILURE(CheckIntValueFromJavascript(
       1, "window.onchangecalls", preview_));
 }
 
 #if defined(OS_WIN)
-#define MAYBE_OnSubmitEvent OnSubmitEvent
+// Disabled, http://crbug.com/62940.
+#define MAYBE_OnSubmitEvent DISABLED_OnSubmitEvent
 #else
 #define MAYBE_OnSubmitEvent DISABLED_OnSubmitEvent
 #endif
 // Verify that the onsubmit event is dispatched upon pressing enter.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_OnSubmitEvent) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
@@ skipping 40 matching lines @@
   // Check that the value is reflected and oncancel is called.
   EXPECT_NO_FATAL_FAILURE(CheckBoolValueFromJavascript(
       true, "window.chrome.sv", contents));
   EXPECT_NO_FATAL_FAILURE(CheckStringValueFromJavascript(
       "abc", "window.chrome.searchBox.value", contents));
   EXPECT_NO_FATAL_FAILURE(CheckBoolValueFromJavascript(
       false, "window.chrome.searchBox.verbatim", contents));
   EXPECT_NO_FATAL_FAILURE(CheckIntValueFromJavascript(
       1, "window.oncancelcalls", contents));
 }