| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index b6f790c852164df2a639e9748964cc31608f7420..31ee3cb6beb5616397b0f6e8f78c4bacc15c360b 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -3217,9 +3217,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, HttpPost) {
|
|
|
| // Prerenders a page that tries to automatically sign user in via the Credential
|
| // Manager API. The page should be killed.
|
| -//
|
| -// Disabled. See http://crbug.com/660278
|
| -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_AutosigninInPrerenderer) {
|
| +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, AutosigninInPrerenderer) {
|
| // Set up a credential in the password store.
|
| PasswordStoreFactory::GetInstance()->SetTestingFactory(
|
| current_browser()->profile(),
|
| @@ -3251,6 +3249,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_AutosigninInPrerenderer) {
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(&CreateCountingInterceptorOnIO,
|
| done_url, empty_file, done_counter.AsWeakPtr()));
|
| + // Loading may finish or be interrupted. The final result is important only.
|
| + // TODO(http://crbug.com/660278): TestPrrenderContents can be created after
|
| + // the JS code runs. The result would be a test timeout.
|
| + DisableLoadEventCheck();
|
| PrerenderTestURL("/password/autosignin.html",
|
| FINAL_STATUS_CREDENTIAL_MANAGER_API, 0);
|
| EXPECT_EQ(0, done_counter.count());
|
|
|