| Index: chrome/browser/crash_recovery_browsertest.cc
|
| diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
|
| index e7ca591acd10b9a7555b578ea7d0d45a1952d0c2..d9702e651938fbc7f3e296e3450695bfc1f253aa 100644
|
| --- a/chrome/browser/crash_recovery_browsertest.cc
|
| +++ b/chrome/browser/crash_recovery_browsertest.cc
|
| @@ -39,9 +39,9 @@ void SimulateRendererCrash(Browser* browser) {
|
| content::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
|
| content::NotificationService::AllSources());
|
| - browser->OpenURL(OpenURLParams(
|
| - GURL(content::kChromeUICrashURL), Referrer(), CURRENT_TAB,
|
| - ui::PAGE_TRANSITION_TYPED, false));
|
| + browser->OpenURL(OpenURLParams(GURL(content::kChromeUICrashURL), Referrer(),
|
| + WindowOpenDisposition::CURRENT_TAB,
|
| + ui::PAGE_TRANSITION_TYPED, false));
|
| observer.Wait();
|
| }
|
|
|
| @@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_before_crash));
|
| SimulateRendererCrash(browser());
|
| - chrome::Reload(browser(), CURRENT_TAB);
|
| + chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_after_crash));
|
| @@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) {
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_before_crash));
|
| SimulateRendererCrash(browser());
|
| - chrome::Reload(browser(), CURRENT_TAB);
|
| + chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_after_crash));
|
| @@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_before_crash));
|
| SimulateRendererCrash(browser());
|
| - chrome::Reload(browser(), CURRENT_TAB);
|
| + chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_after_crash));
|
| @@ -167,11 +167,11 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) {
|
|
|
| SimulateRendererCrash(browser());
|
|
|
| - chrome::Reload(browser(), CURRENT_TAB);
|
| + chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
|
|
|
| - chrome::Reload(browser(), CURRENT_TAB);
|
| + chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
|
| }
|
|
|