| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 1e6546d7b64e209525dd8e57231dece681de3e7f..de14f6de264b96883ff72ff176a02c6efff532ad 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -2483,7 +2483,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) {
|
|
|
| // Checks that when the cache is cleared, prerenders are cancelled but
|
| // prerendering history is not cleared.
|
| -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) {
|
| +// Flaky/times out on linux_aura, win, mac - http://crbug.com/270948
|
| +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderClearCache) {
|
| PrerenderTestURL("files/prerender/prerender_page.html",
|
| FINAL_STATUS_CACHE_OR_HISTORY_CLEARED,
|
| 1);
|
|
|