| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <deque> | 5 #include <deque> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1568 EXPECT_TRUE(url_b_is_active_prerender && url_c_is_active_prerender); | 1568 EXPECT_TRUE(url_b_is_active_prerender && url_c_is_active_prerender); |
| 1569 EXPECT_FALSE(UrlIsPending(kHtmlFileB)); | 1569 EXPECT_FALSE(UrlIsPending(kHtmlFileB)); |
| 1570 EXPECT_FALSE(UrlIsPending(kHtmlFileC)); | 1570 EXPECT_FALSE(UrlIsPending(kHtmlFileC)); |
| 1571 } | 1571 } |
| 1572 | 1572 |
| 1573 // See crbug.com/131836. | 1573 // See crbug.com/131836. |
| 1574 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) { | 1574 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) { |
| 1575 // Show the task manager. This populates the model. | 1575 // Show the task manager. This populates the model. |
| 1576 current_browser()->window()->ShowTaskManager(); | 1576 current_browser()->window()->ShowTaskManager(); |
| 1577 // Wait for the model of task manager to start. | 1577 // Wait for the model of task manager to start. |
| 1578 TaskManagerBrowserTestUtil::WaitForResourceChange(2); | 1578 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); |
| 1579 | 1579 |
| 1580 // Start with two resources. | 1580 // Start with two resources. |
| 1581 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 1581 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
| 1582 | 1582 |
| 1583 // One of the resources that has a WebContents associated with it should have | 1583 // One of the resources that has a WebContents associated with it should have |
| 1584 // the Prerender prefix. | 1584 // the Prerender prefix. |
| 1585 const string16 prefix = | 1585 const string16 prefix = |
| 1586 l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX, string16()); | 1586 l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX, string16()); |
| 1587 string16 prerender_title; | 1587 string16 prerender_title; |
| 1588 int num_prerender_tabs = 0; | 1588 int num_prerender_tabs = 0; |
| (...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2419 ResultCatcher catcher; | 2419 ResultCatcher catcher; |
| 2420 | 2420 |
| 2421 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2421 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
| 2422 NavigateToDestURL(); | 2422 NavigateToDestURL(); |
| 2423 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2423 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
| 2424 | 2424 |
| 2425 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2425 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 2426 } | 2426 } |
| 2427 | 2427 |
| 2428 } // namespace prerender | 2428 } // namespace prerender |
| OLD | NEW |