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

chrome/test/ui_test_utils.h

Index: chrome/test/ui_test_utils.h
===================================================================
--- chrome/test/ui_test_utils.h	(revision 22808)
+++ chrome/test/ui_test_utils.h	(working copy)
@@ -17,6 +17,7 @@
 class GURL;
 class NavigationController;
 class RenderViewHost;
+class TabContents;
 class Value;
 
 // A collections of functions designed for use with InProcessBrowserTest.
@@ -90,6 +91,8 @@
 // Blocks until an application modal dialog is showns and returns it.
 AppModalDialog* WaitForAppModalDialog();
 
+// Causes the specified tab to crash. Blocks until it is crashed.
+void CrashTab(TabContents* tab);
 }
 
 #endif  // CHROME_TEST_UI_TEST_UTILS_H_
Property changes on: chrome\test\ui_test_utils.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/test/ui_test_utils.h:r69-2775
   Merged /trunk/src/chrome/test/ui_test_utils.h:r21961