Merge 21961 - The focus would be messedup when reloading a crashed tab, also ...

chrome/test/ui_test_utils.cc

 // 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/test/ui_test_utils.h"
 
 #include "base/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/process_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
@@ skipping 202 matching lines @@
   }
 
  private:
   NotificationRegistrar registrar_;
 
   AppModalDialog* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogObserver);
 };
 
+class CrashedRenderProcessObserver : public NotificationObserver {
+ public:
+  explicit CrashedRenderProcessObserver(RenderProcessHost* rph) {
+    registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
+                   Source<RenderProcessHost>(rph));
+    ui_test_utils::RunMessageLoop();
+  }
+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    if (type == NotificationType::RENDERER_PROCESS_CLOSED) {
+      MessageLoopForUI::current()->Quit();
+    } else {
+      NOTREACHED();
+    }
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(CrashedRenderProcessObserver);
+};
+
 }  // namespace
 
 void RunMessageLoop() {
   MessageLoopForUI* loop = MessageLoopForUI::current();
   bool did_allow_task_nesting = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
 #if defined (OS_WIN)
   views::AcceleratorHandler handler;
   loop->Run(&handler);
 #else
@@ skipping 121 matching lines @@
 
 void WaitForDownloadCount(DownloadManager* download_manager, size_t count) {
   DownloadsCompleteObserver download_observer(download_manager, count);
 }
 
 AppModalDialog* WaitForAppModalDialog() {
   AppModalDialogObserver observer;
   return observer.WaitForAppModalDialog();
 }
 
+void CrashTab(TabContents* tab) {
+  RenderProcessHost* rph = tab->render_view_host()->process();
+  base::KillProcess(rph->process().handle(), 0, false);
+  CrashedRenderProcessObserver crash_observer(rph);
+}
+
 }  // namespace ui_test_utils