| Index: chrome/browser/crash_recovery_browsertest.cc
|
| diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
|
| index 0bbb48506136fe03afb46517b89a4cf7168c4589..3d644a3ee2dee19b8d391305926bbffcc1c7787e 100644
|
| --- a/chrome/browser/crash_recovery_browsertest.cc
|
| +++ b/chrome/browser/crash_recovery_browsertest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "content/browser/tab_contents/navigation_entry.h"
|
| +#include "content/browser/tab_contents/tab_contents.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/common/page_transition_types.h"
|
| @@ -31,7 +32,7 @@ class CrashRecoveryBrowserTest : public InProcessBrowserTest {
|
| };
|
|
|
| // Test that reload works after a crash.
|
| -// Disabled, http://crbug.com/29331, http://crbug.com/69637.
|
| +// Disabled, http://crbug.com/29331 , http://crbug.com/69637 .
|
| IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
|
| // The title of the active tab should change each time this URL is loaded.
|
| GURL url(
|
| @@ -47,7 +48,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - &browser()->GetSelectedTabContentsWrapper()->controller()));
|
| + &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
|
| + controller()));
|
| browser()->Reload(CURRENT_TAB);
|
| observer.Wait();
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| @@ -76,7 +78,8 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(
|
| - &browser()->GetSelectedTabContentsWrapper()->controller()));
|
| + &browser()->GetSelectedTabContentsWrapper()->tab_contents()->
|
| + controller()));
|
| browser()->Reload(CURRENT_TAB);
|
| observer.Wait();
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
|
|