Disable autocomplete browser test just on Win; clean up comments.

chrome/browser/autocomplete/autocomplete_edit_view_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 <stdio.h>
 
 #include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 260 matching lines @@
         break;
       default:
         FAIL() << "Unexpected notification type";
     }
     MessageLoopForUI::current()->Quit();
   }
 };
 
 // Test if ctrl-* accelerators are workable in omnibox.
 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_BrowserAccelerators DISABLED_BrowserAccelerators
 #else
 #define MAYBE_BrowserAccelerators BrowserAccelerators
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_BrowserAccelerators) {
   browser()->FocusLocationBar();
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
@@ skipping 38 matching lines @@
   EXPECT_EQ(L"Hello ", edit_view->GetText());
 
 #if !defined(OS_CHROMEOS)
   // Try alt-f4 to close the browser.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       browser(), app::VKEY_F4, false, false, true, false,
       NotificationType::BROWSER_CLOSED, Source<Browser>(browser())));
 #endif
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators
 #else
 #define MAYBE_PopupAccelerators PopupAccelerators
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_PopupAccelerators) {
   // Create a popup.
   Browser* popup = CreateBrowserForPopup(browser()->profile());
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditViewForBrowser(popup, &edit_view));
@@ skipping 32 matching lines @@
   EXPECT_EQ(L"Hello world", edit_view->GetText());
 
 #if !defined(OS_CHROMEOS)
   // Try alt-f4 to close the popup.
   ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
       popup, app::VKEY_F4, false, false, true, false,
       NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
 #endif
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_BackspaceInKeywordMode DISABLED_BackspaceInKeywordMode
 #else
 #define MAYBE_BackspaceInKeywordMode BackspaceInKeywordMode
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_BackspaceInKeywordMode) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
@@ skipping 37 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_HOME, false, false, false));
   // Backspace at the beginning of the search text shall turn off
   // the keyword mode.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_BACK, false, false, false));
   ASSERT_FALSE(edit_view->model()->is_keyword_hint());
   ASSERT_EQ(std::string(), WideToUTF8(edit_view->model()->keyword()));
   ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
             WideToUTF8(edit_view->GetText()));
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_Escape DISABLED_Escape
 #else
 #define MAYBE_Escape Escape
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_Escape) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
   std::wstring old_text = edit_view->GetText();
   EXPECT_FALSE(old_text.empty());
   EXPECT_TRUE(edit_view->IsSelectAll());
 
   // Delete all text in omnibox.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_BACK, false, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Escape shall revert the text in omnibox.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_ESCAPE, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
   EXPECT_TRUE(edit_view->IsSelectAll());
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_DesiredTLD DISABLED_DesiredTLD
 #else
 #define MAYBE_DesiredTLD DesiredTLD
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_DesiredTLD) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
   ASSERT_TRUE(popup_model);
 
   // Test ctrl-Enter.
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
   // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be opened.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN, true, false, false));
 
   GURL url = browser()->GetSelectedTabContents()->GetURL();
   EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_AltEnter DISABLED_AltEnter
 #else
 #define MAYBE_AltEnter AltEnter
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_AltEnter) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
   edit_view->SetUserText(ASCIIToWide(chrome::kChromeUIHistoryURL));
   int tab_count = browser()->tab_count();
   // alt-Enter opens a new tab.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN, false, false, true));
   ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_EnterToSearch DISABLED_EnterToSearch
 #else
 #define MAYBE_EnterToSearch EnterToSearch
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EnterToSearch) {
   ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
   ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
   browser()->FocusLocationBar();
 
@@ skipping 29 matching lines @@
             popup_model->result().default_match()->type);
 
   // Open the default match.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN, false, false, false));
   url = browser()->GetSelectedTabContents()->GetURL();
   EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
 }
 
 // See http://crbug.com/20934: Omnibox keyboard behavior wrong for
 // "See recent pages in history"
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_EnterToOpenHistoryPage DISABLED_EnterToOpenHistoryPage
 #else
 #define MAYBE_EnterToOpenHistoryPage EnterToOpenHistoryPage
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EnterToOpenHistoryPage) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
@@ skipping 22 matching lines @@
   // Make sure the history page item is selected.
   ASSERT_EQ(AutocompleteMatch::OPEN_HISTORY_PAGE,
             popup_model->result().match_at(popup_model->selected_line()).type);
 
   // Open the history page item.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_RETURN, false, false, false));
   GURL url = browser()->GetSelectedTabContents()->GetURL();
   EXPECT_STREQ(kHistoryPageURL, url.spec().c_str());
 }
 
-// FAILS on windows, http://crbug.com/57965
+// Sometimes times out on Windows: http://crbug.com/57965
 #if defined(OS_WIN)
 #define MAYBE_EscapeToDefaultMatch DISABLED_EscapeToDefaultMatch
 #else
 #define MAYBE_EscapeToDefaultMatch EscapeToDefaultMatch
 #endif
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EscapeToDefaultMatch) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
@@ skipping 24 matching lines @@
   }
 
   EXPECT_NE(old_text, edit_view->GetText());
 
   // Escape shall revert back to the default match item.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_ESCAPE, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
   EXPECT_EQ(old_selected_line, popup_model->selected_line());
 }
 
-// Disabled, http://crbug.com/62935.
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, DISABLED_BasicTextOperations) {
+// Sometimes times out on Windows: http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_BasicTextOperations DISABLED_BasicTextOperations
+#else
+#define MAYBE_BasicTextOperations BasicTextOperations
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_BasicTextOperations) {
   ASSERT_NO_FATAL_FAILURE(SetupComponents());
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
   std::wstring old_text = edit_view->GetText();
   EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), old_text);
   EXPECT_TRUE(edit_view->IsSelectAll());
@@ skipping 103 matching lines @@
 
   // Undo delete two characters.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_Z, true, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
 
   // Undo again.
   ASSERT_NO_FATAL_FAILURE(SendKey(app::VKEY_Z, true, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 }
 #endif