Convert crash recovery tests to browser test framework, which should reduce flakiness.

chrome/browser/crash_recovery_uitest.cc

Index: chrome/browser/crash_recovery_uitest.cc
diff --git a/chrome/browser/crash_recovery_uitest.cc b/chrome/browser/crash_recovery_uitest.cc
deleted file mode 100644
index e016156f011787fcc913912c5ff49fcb3a8480aa..0000000000000000000000000000000000000000
--- a/chrome/browser/crash_recovery_uitest.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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/platform_thread.h"
-#include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/ui/ui_test.h"
-#include "net/base/net_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-typedef UITest CrashRecoveryUITest;
-
-TEST_F(CrashRecoveryUITest, Reload) {
-  // Test that reload works after a crash.
-
-  // This test only works in multi-process mode
-  if (in_process_renderer())
-    return;
-
-  // The title of the active tab should change each time this URL is loaded.
-  GURL url(
-      "data:text/html,<script>document.title=new Date().valueOf()</script>");
-
-  NavigateToURL(url);
-
-  std::wstring title1 = GetActiveTabTitle();
-
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-
-  // Cause the renderer to crash.
-  // TODO: Need to port crash_service.exe.
-#if defined(OS_WIN)
-  expected_crashes_ = 1;
-#endif
-  tab->NavigateToURLAsync(GURL("about:crash"));
-
-  // Wait for the browser to notice the renderer crash.
-  PlatformThread::Sleep(1000);
-
-  tab->Reload();
-
-  std::wstring title2 = GetActiveTabTitle();
-  EXPECT_NE(title1, title2);
-}
-
-// Tests that loading a crashed page in a new tab correctly updates the title.
-// There was an earlier bug (1270510) in process-per-site in which the max page
-// ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
-// was not committed.  This prevents regression of that bug.
-TEST_F(CrashRecoveryUITest, LoadInNewTab) {
-  // This test only works in multi-process mode
-  if (in_process_renderer())
-    return;
-
-  // The title of the active tab should change each time this URL is loaded.
-  FilePath test_file(test_data_directory_);
-  test_file = test_file.AppendASCII("title2.html");
-  GURL url(net::FilePathToFileURL(test_file));
-
-  NavigateToURL(url);
-
-  const std::wstring title(L"Title Of Awesomeness");
-  EXPECT_EQ(title, GetActiveTabTitle());
-
-  scoped_refptr<TabProxy> tab(GetActiveTab());
-  ASSERT_TRUE(tab.get());
-
-  // Cause the renderer to crash.
-  // TODO: Need to port crash_service.exe.
-#if defined(OS_WIN)
-  expected_crashes_ = 1;
-#endif
-
-  tab->NavigateToURLAsync(GURL("about:crash"));
-
-  // Wait for the browser to notice the renderer crash.
-  PlatformThread::Sleep(1000);
-
-  scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(browser_proxy->AppendTab(url));
-
-  // Ensure the title of the new tab is updated, indicating that the navigation
-  // entry was properly committed.
-  EXPECT_EQ(title, GetActiveTabTitle());
-}