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

chrome/browser/crash_recovery_browsertest.cc

Index: chrome/browser/crash_recovery_browsertest.cc
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1a61b152f68996c5b172ef8902237f946350f16f
--- /dev/null
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -0,0 +1,97 @@
+// Copyright (c) 2009 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 "chrome/browser/browser.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/notification_registrar.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/common/page_transition_types.h"
+#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/window_open_disposition.h"
+
+namespace {
+
+// Used to block until a navigation completes.
+class RendererCrashObserver : public NotificationObserver {
+ public:
+  RendererCrashObserver() {}
+
+  void WaitForRendererCrash() {
+    registrar_.Add(this, NotificationType::TAB_CONTENTS_DISCONNECTED,
+                   NotificationService::AllSources());
+    ui_test_utils::RunMessageLoop();
+  }
+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    if (type == NotificationType::TAB_CONTENTS_DISCONNECTED) {
+      registrar_.Remove(this, NotificationType::TAB_CONTENTS_DISCONNECTED,
+                        NotificationService::AllSources());
+      MessageLoopForUI::current()->Quit();
+    } else {
+      NOTREACHED();
+    }
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(RendererCrashObserver);
+};
+
+void SimulateRendererCrash(Browser* browser) {
+  browser->OpenURL(GURL("about:crash"), GURL(), CURRENT_TAB,
+                   PageTransition::TYPED);
+  RendererCrashObserver crash_observer;
+  crash_observer.WaitForRendererCrash();
+
+}
+
+}  // namespace
+
+class CrashRecoveryBrowserTest : public InProcessBrowserTest {
+};
+
+// Test that reload works after a crash.
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
+  // 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>");
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  string16 title_before_crash;
+  string16 title_after_crash;
+
+  ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
+                                                &title_before_crash));
+  SimulateRendererCrash(browser());
+  ASSERT_TRUE(ui_test_utils::ReloadCurrentTab(browser()));
+  ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
+                                                &title_after_crash));
+  EXPECT_NE(title_before_crash, title_after_crash);
+}
+
+// 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.
+IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
+  ui_test_utils::NavigateToURL(browser(),
+                               ui_test_utils::GetTestUrl(L".", L"title2.html"));
+
+  string16 title_before_crash;
+  string16 title_after_crash;
+
+  ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
+                                                &title_before_crash));
+  SimulateRendererCrash(browser());
+  ASSERT_TRUE(ui_test_utils::ReloadCurrentTab(browser()));
+  ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
+                                                &title_after_crash));
+  EXPECT_EQ(title_before_crash, title_after_crash);
+}