| Index: chrome/browser/crash_recovery_browsertest.cc
|
| diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
|
| index 9634546b07c78bd244ad3e08d1ae1ee4c992f3fb..2f96e82b66f26c50c754d4ae84e4978e64c3ba78 100644
|
| --- a/chrome/browser/crash_recovery_browsertest.cc
|
| +++ b/chrome/browser/crash_recovery_browsertest.cc
|
| @@ -16,6 +16,8 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| +#include "content/public/browser/navigation_controller.h"
|
| +#include "content/public/browser/navigation_entry.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -140,10 +142,10 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
|
| const base::FilePath::CharType kTitle2File[] =
|
| FILE_PATH_LITERAL("title2.html");
|
|
|
| - ui_test_utils::NavigateToURL(
|
| - browser(), ui_test_utils::GetTestUrl(
|
| - base::FilePath(base::FilePath::kCurrentDirectory),
|
| - base::FilePath(kTitle2File)));
|
| + GURL url(ui_test_utils::GetTestUrl(
|
| + base::FilePath(base::FilePath::kCurrentDirectory),
|
| + base::FilePath(kTitle2File)));
|
| + ui_test_utils::NavigateToURL(browser(), url);
|
|
|
| base::string16 title_before_crash;
|
| base::string16 title_after_crash;
|
| @@ -151,6 +153,9 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
| &title_before_crash));
|
| SimulateRendererCrash(browser());
|
| + ASSERT_EQ(GURL(content::kChromeUICrashURL),
|
| + GetActiveWebContents()->GetController().GetVisibleEntry()->
|
| + GetVirtualURL());
|
| chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
|
| content::WaitForLoadStop(GetActiveWebContents());
|
| ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
|
|
|