[GTTF] Various ui tests cleanups:

chrome/browser/browser_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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "gfx/native_widget_types.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
 namespace {
 
-// Delay to let the browser shut down before trying more brutal methods.
-static const int kWaitForTerminateMsec = 30000;
-
 class BrowserTest : public UITest {
-
- protected:
-  void TerminateBrowser() {
-#if defined(OS_WIN)
-    scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-    ASSERT_TRUE(browser.get());
-    ASSERT_TRUE(browser->TerminateSession());
-#elif defined(OS_POSIX)
-    // There's nothing to do here if the browser is not running.
-    if (IsBrowserRunning()) {
-      EXPECT_TRUE(automation()->SetFilteredInet(false));
-
-      int window_count = 0;
-      EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-
-      // Now, drop the automation IPC channel so that the automation provider in
-      // the browser notices and drops its reference to the browser process.
-      automation()->Disconnect();
-
-      EXPECT_EQ(kill(process_, SIGTERM), 0);
-
-      // Wait for the browser process to quit. It should have quit when it got
-      // SIGTERM.
-      int timeout = kWaitForTerminateMsec;
-#ifdef WAIT_FOR_DEBUGGER_ON_OPEN
-      timeout = 500000;
-#endif
-      if (!base::WaitForSingleProcess(process_, timeout)) {
-        // We need to force the browser to quit because it didn't quit fast
-        // enough. Take no chance and kill every chrome processes.
-        CleanupAppProcesses();
-      }
-
-      // Don't forget to close the handle
-      base::CloseProcessHandle(process_);
-      process_ = NULL;
-    }
-#endif  // OS_POSIX
-  }
 };
 
 class VisibleBrowserTest : public UITest {
  protected:
   VisibleBrowserTest() : UITest() {
     show_window_ = true;
   }
 };
 
 #if defined(OS_WIN)
 // The browser should quit quickly if it receives a WM_ENDSESSION message.
 TEST_F(BrowserTest, WindowsSessionEnd) {
 #elif defined(OS_POSIX)
 // The browser should quit gracefully and quickly if it receives a SIGTERM.
 TEST_F(BrowserTest, PosixSessionEnd) {
 #endif
-#if defined(OS_WIN) || defined(OS_POSIX)
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title1.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
-  PlatformThread::Sleep(action_timeout_ms());
-
   TerminateBrowser();
-
-  PlatformThread::Sleep(action_timeout_ms());
   ASSERT_FALSE(IsBrowserRunning());
 
   // Make sure the UMA metrics say we didn't crash.
   scoped_ptr<DictionaryValue> local_prefs(GetLocalState());
   bool exited_cleanly;
   ASSERT_TRUE(local_prefs.get());
   ASSERT_TRUE(local_prefs->GetBoolean(prefs::kStabilityExitedCleanly,
                                       &exited_cleanly));
   ASSERT_TRUE(exited_cleanly);
 
   // And that session end was successful.
   bool session_end_completed;
   ASSERT_TRUE(local_prefs->GetBoolean(prefs::kStabilitySessionEndCompleted,
                                       &session_end_completed));
   ASSERT_TRUE(session_end_completed);
 
   // Make sure session restore says we didn't crash.
   scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences());
   ASSERT_TRUE(profile_prefs.get());
   ASSERT_TRUE(profile_prefs->GetBoolean(prefs::kSessionExitedCleanly,
                                         &exited_cleanly));
   ASSERT_TRUE(exited_cleanly);
 }
-#endif  // OS_WIN || OS_POSIX
 
 // Test that scripts can fork a new renderer process for a tab in a particular
 // case (which matches following a link in Gmail).  The script must open a new
 // tab, set its window.opener to null, and redirect it to a cross-site URL.
 // (Bug 1115708)
 // This test can only run if V8 is in use, and not KJS, because KJS will not
 // set window.opener to null properly.
 #ifdef CHROME_V8
 TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
   // This test only works in multi-process mode
@@ skipping 26 matching lines @@
 
   // Make sure that a new tab has been created and that we have a new renderer
   // process for it.
   ASSERT_TRUE(tab->NavigateToURLAsync(fork_url));
   PlatformThread::Sleep(action_timeout_ms());
   ASSERT_EQ(orig_process_count + 1, GetBrowserProcessCount());
   int new_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&new_tab_count));
   ASSERT_EQ(orig_tab_count + 1, new_tab_count);
 }
-#endif
+#endif  // CHROME_V8
 
 // This test fails on ChromeOS (it has never been known to work on it).
 // http://crbug.com/32799
 #if defined(OS_CHROMEOS)
 #define MAYBE_OtherRedirectsDontForkProcess DISABLED_OtherRedirectsDontForkProcess
 #else
 #define MAYBE_OtherRedirectsDontForkProcess OtherRedirectsDontForkProcess
 #endif
 
 // Tests that non-Gmail-like script redirects (i.e., non-null window.opener) or
@@ skipping 80 matching lines @@
   scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
   ASSERT_TRUE(browser.get());
   scoped_refptr<TabProxy> tab = browser->GetActiveTab();
   ASSERT_TRUE(tab.get());
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_EQ(L"SUCCESS", title);
 }
 
 class SecurityTest : public UITest {
- protected:
-  static const int kTestIntervalMs = 250;
-  static const int kTestWaitTimeoutMs = 60 * 1000;
 };
 
 TEST_F(SecurityTest, DisallowFileUrlUniversalAccessTest) {
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("fileurl_universalaccess.html");
 
   GURL url = net::FilePathToFileURL(test_file);
   ASSERT_TRUE(tab->NavigateToURL(url));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
-        "status", kTestIntervalMs, kTestWaitTimeoutMs);
+        "status", sleep_timeout_ms(), action_max_timeout_ms());
   ASSERT_STREQ("Disallowed", value.c_str());
 }
 
 #if !defined(OS_MACOSX)
 class KioskModeTest : public UITest {
  public:
   KioskModeTest() {
     launch_arguments_.AppendSwitch(switches::kKioskMode);
   }
 };
 
 TEST_F(KioskModeTest, EnableKioskModeTest) {
   // Load a dummy url.
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title1.html");
 
   // Verify that the window is present.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   // Check if browser is in fullscreen mode.
   bool is_visible;
   ASSERT_TRUE(browser->IsFullscreen(&is_visible));
   EXPECT_TRUE(is_visible);
   ASSERT_TRUE(browser->IsFullscreenBubbleVisible(&is_visible));
   EXPECT_FALSE(is_visible);
 }
-#endif
+#endif  // !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 // This test verifies that Chrome can be launched with a user-data-dir path
 // which contains non ASCII characters.
 class LaunchBrowserWithNonAsciiUserDatadir : public UITest {
 public:
   void SetUp() {
     PathService::Get(base::DIR_TEMP, &tmp_profile_);
     tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile");
     tmp_profile_ = tmp_profile_.Append(L"Test Chrome Géraldine");
@@ skipping 19 matching lines @@
 public:
   FilePath tmp_profile_;
 };
 
 TEST_F(LaunchBrowserWithNonAsciiUserDatadir, TestNonAsciiUserDataDir) {
   ASSERT_TRUE(LaunchAppWithProfile());
   // Verify that the window is present.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 }
-#endif
+#endif  // defined(OS_WIN)
 
 }  // namespace