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 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1806 // and not pending. One and only one of the URLs (the last seen) should be the | 1806 // and not pending. One and only one of the URLs (the last seen) should be the |
1807 // active entry. | 1807 // active entry. |
1808 bool url_b_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileB); | 1808 bool url_b_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileB); |
1809 bool url_c_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileC); | 1809 bool url_c_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileC); |
1810 EXPECT_TRUE(url_b_is_active_prerender && url_c_is_active_prerender); | 1810 EXPECT_TRUE(url_b_is_active_prerender && url_c_is_active_prerender); |
1811 } | 1811 } |
1812 | 1812 |
1813 // See crbug.com/131836. | 1813 // See crbug.com/131836. |
1814 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) { | 1814 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) { |
1815 // Show the task manager. This populates the model. | 1815 // Show the task manager. This populates the model. |
1816 current_browser()->window()->ShowTaskManager(); | 1816 chrome::OpenTaskManager(current_browser(), false); |
1817 // Wait for the model of task manager to start. | 1817 // Wait for the model of task manager to start. |
1818 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); | 1818 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); |
1819 | 1819 |
1820 // Start with two resources. | 1820 // Start with two resources. |
1821 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 1821 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
1822 | 1822 |
1823 // One of the resources that has a WebContents associated with it should have | 1823 // One of the resources that has a WebContents associated with it should have |
1824 // the Prerender prefix. | 1824 // the Prerender prefix. |
1825 const string16 prefix = | 1825 const string16 prefix = |
1826 l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX, string16()); | 1826 l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX, string16()); |
(...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2781 // Checks that non-http/https main page redirects cancel the prerender. | 2781 // Checks that non-http/https main page redirects cancel the prerender. |
2782 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2782 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
2783 PrerenderCancelMainFrameRedirectUnsupportedScheme) { | 2783 PrerenderCancelMainFrameRedirectUnsupportedScheme) { |
2784 GURL url = test_server()->GetURL( | 2784 GURL url = test_server()->GetURL( |
2785 CreateServerRedirect("invalidscheme://www.google.com/test.html")); | 2785 CreateServerRedirect("invalidscheme://www.google.com/test.html")); |
2786 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); | 2786 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); |
2787 NavigateToDestURL(); | 2787 NavigateToDestURL(); |
2788 } | 2788 } |
2789 | 2789 |
2790 } // namespace prerender | 2790 } // namespace prerender |
OLD | NEW |