[GTTF] Miscellanous UI tests cleanups:

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
@@ skipping 215 matching lines @@
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 }
 
 TEST_F(AutomationProxyTest, ActivateTab) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   ASSERT_TRUE(window->AppendTab(GURL("about:blank")));
 
-  int at_index = 1;
-  ASSERT_TRUE(window->ActivateTab(at_index));
+  ASSERT_TRUE(window->ActivateTab(1));
   int active_tab_index = -1;
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(at_index, active_tab_index);
+  ASSERT_EQ(1, active_tab_index);
 
-  at_index = 0;
-  ASSERT_TRUE(window->ActivateTab(at_index));
+  ASSERT_TRUE(window->ActivateTab(0));
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(at_index, active_tab_index);
+  ASSERT_EQ(0, active_tab_index);
 }
 
-
 TEST_F(AutomationProxyTest, GetTab) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   {
     scoped_refptr<TabProxy> tab(window->GetTab(0));
     ASSERT_TRUE(tab.get());
     std::wstring title;
     ASSERT_TRUE(tab->GetTabTitle(&title));
     // BUG [634097] : expected title should be "about:blank"
     ASSERT_STREQ(L"", title.c_str());
@@ skipping 98 matching lines @@
   FilePath document1_;
   FilePath document2_;
 };
 
 TEST_F(AutomationProxyTest2, GetActiveTabIndex) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   int active_tab_index = -1;
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
-  int tab_count;
-  ASSERT_TRUE(window->GetTabCount(&tab_count));
   ASSERT_EQ(0, active_tab_index);
-  int at_index = 1;
-  ASSERT_TRUE(window->ActivateTab(at_index));
+
+  ASSERT_TRUE(window->ActivateTab(1));
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
-  ASSERT_EQ(at_index, active_tab_index);
+  ASSERT_EQ(1, active_tab_index);
 }
 
 TEST_F(AutomationProxyTest2, GetTabTitle) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"title1.html", title.c_str());
@@ skipping 51 matching lines @@
   ASSERT_TRUE(tab->NavigateToURLAsync(newurl));
   std::string value = WaitUntilCookieNonEmpty(tab.get(), newurl, "foo",
                                               action_max_timeout_ms());
   ASSERT_STREQ("baz", value.c_str());
 }
 
 TEST_F(AutomationProxyTest, AcceleratorNewTab) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
 
   int tab_count = -1;
-  ASSERT_TRUE(window->GetTabCount(&tab_count));
-  EXPECT_EQ(1, tab_count);
-
   ASSERT_TRUE(window->RunCommand(IDC_NEW_TAB));
   ASSERT_TRUE(window->GetTabCount(&tab_count));
   EXPECT_EQ(2, tab_count);
-  scoped_refptr<TabProxy> tab(window->GetTab(tab_count - 1));
+
+  scoped_refptr<TabProxy> tab(window->GetTab(1));
   ASSERT_TRUE(tab.get());
 }
 
 class AutomationProxyTest4 : public UITest {
  protected:
   AutomationProxyTest4() : UITest() {
     dom_automation_enabled_ = true;
   }
 };
 
@@ skipping 97 matching lines @@
 
   std::wstring xpath2 = L"/html/body/iframe";
   std::wstring jscript2 = CreateJSStringForDOMQuery(L"myspan");
   ASSERT_TRUE(tab->ExecuteAndExtractString(xpath2, jscript2, &actual));
   ASSERT_EQ(L"SPAN", actual);
 
   std::wstring xpath3 = L"/html/body/iframe\n/html/body/iframe";
   std::wstring jscript3 = CreateJSStringForDOMQuery(L"mydiv");
   ASSERT_TRUE(tab->ExecuteAndExtractString(xpath3, jscript3, &actual));
   ASSERT_EQ(L"DIV", actual);
-
-  // TODO(evanm): fix or remove this.
-  // This part of the test appears to verify that executing JS fails
-  // non-HTML pages, but the new tab is now HTML so this test isn't
-  // correct.
-#if 0
-  // Open a new Destinations tab to execute script inside.
-  window->RunCommand(IDC_NEWTAB);
-  tab = window->GetTab(1);
-  ASSERT_TRUE(tab.get());
-  ASSERT_TRUE(window->ActivateTab(1));
-
-  ASSERT_FALSE(tab->ExecuteAndExtractString(xpath1, jscript1, &actual));
-#endif
 }
 
-// TODO(port): Need to port constrained_window_proxy.* first.
-#if defined(OS_WIN)
 TEST_F(AutomationProxyTest, BlockedPopupTest) {
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("constrained_files");
   filename = filename.AppendASCII("constrained_window.html");
 
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
-  ASSERT_TRUE(tab->WaitForBlockedPopupCountToChangeTo(2, 5000));
+  ASSERT_TRUE(tab->WaitForBlockedPopupCountToChangeTo(2,
+                                                      action_max_timeout_ms()));
 }
 
-#endif  // defined(OS_WIN)
-
 // TODO(port): Remove HWND if possible
 #if defined(OS_WIN)
 
 const char simple_data_url[] =
     "data:text/html,<html><head><title>External tab test</title></head>"
     "<body>A simple page for testing a floating/invisible tab<br></div>"
     "</body></html>";
 
 ExternalTabUITestMockClient::ExternalTabUITestMockClient(int execution_timeout)
     : AutomationProxy(execution_timeout),
@@ skipping 735 matching lines @@
 #endif
 TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<AutocompleteEditProxy> edit(
       browser->GetAutocompleteEdit());
   ASSERT_TRUE(edit.get());
   EXPECT_TRUE(browser->ApplyAccelerator(IDC_FOCUS_LOCATION));
   EXPECT_TRUE(edit->is_valid());
   EXPECT_TRUE(edit->SetText(L"Roflcopter"));
-  EXPECT_TRUE(edit->WaitForQuery(30000));
+  EXPECT_TRUE(edit->WaitForQuery(action_max_timeout_ms()));
   bool query_in_progress;
   EXPECT_TRUE(edit->IsQueryInProgress(&query_in_progress));
   EXPECT_FALSE(query_in_progress);
   std::vector<AutocompleteMatchData> matches;
   EXPECT_TRUE(edit->GetAutocompleteMatches(&matches));
   EXPECT_FALSE(matches.empty());
 }
 
-// This test is flaky, see http://crbug.com/5314. Disabled because it hangs
-// on Mac (http://crbug.com/25039).
-TEST_F(AutomationProxyTest, DISABLED_AppModalDialogTest) {
+#if defined(OS_MACOSX)
+// Hangs on Mac, http://crbug.com/25039.
+#define AppModalDialogTest DISABLED_AppModalDialogTest
+#else
+// Flaky, http://crbug.com/5314.
+#define AppModalDialogTest FLAKY_AppModalDialogTest
+#endif
+TEST_F(AutomationProxyTest, AppModalDialogTest) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<TabProxy> tab(browser->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   bool modal_dialog_showing = false;
   MessageBoxFlags::DialogButton button = MessageBoxFlags::DIALOGBUTTON_NONE;
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
@@ skipping 91 matching lines @@
   scoped_refptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("dom_automation_test_with_popup.html");
 
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   // Allow some time for the popup to show up and close.
-  PlatformThread::Sleep(2000);
+  PlatformThread::Sleep(sleep_timeout_ms());
 
   std::wstring expected(L"string");
   std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
   std::wstring actual;
   ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
   ASSERT_EQ(expected, actual);
 }