| 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 2706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2717 ChannelDestructionWatcher channel_close_watcher; | 2717 ChannelDestructionWatcher channel_close_watcher; |
| 2718 channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> | 2718 channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> |
| 2719 GetActiveWebContents()->GetRenderProcessHost()); | 2719 GetActiveWebContents()->GetRenderProcessHost()); |
| 2720 NavigateToDestURL(); | 2720 NavigateToDestURL(); |
| 2721 channel_close_watcher.WaitForChannelClose(); | 2721 channel_close_watcher.WaitForChannelClose(); |
| 2722 | 2722 |
| 2723 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2723 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
| 2724 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2724 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 2725 } | 2725 } |
| 2726 | 2726 |
| 2727 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) { | 2727 // Fails often on Windows dbg bots. http://crbug.com/177163 |
| 2728 #if defined(OS_WIN) |
| 2729 #define MAYBE_TabsApi DISABLED_TabsApi |
| 2730 #else |
| 2731 #define MAYBE_TabsApi TabsApi |
| 2732 #endif // defined(OS_WIN) |
| 2733 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, MAYBE_TabsApi) { |
| 2728 ASSERT_TRUE(StartTestServer()); | 2734 ASSERT_TRUE(StartTestServer()); |
| 2729 extensions::FrameNavigationState::set_allow_extension_scheme(true); | 2735 extensions::FrameNavigationState::set_allow_extension_scheme(true); |
| 2730 | 2736 |
| 2731 // Wait for the extension to set itself up and return control to us. | 2737 // Wait for the extension to set itself up and return control to us. |
| 2732 ASSERT_TRUE(RunExtensionSubtest("tabs/on_replaced", "on_replaced.html")) | 2738 ASSERT_TRUE(RunExtensionSubtest("tabs/on_replaced", "on_replaced.html")) |
| 2733 << message_; | 2739 << message_; |
| 2734 | 2740 |
| 2735 ResultCatcher catcher; | 2741 ResultCatcher catcher; |
| 2736 | 2742 |
| 2737 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2743 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2782 // Checks that non-http/https main page redirects cancel the prerender. | 2788 // Checks that non-http/https main page redirects cancel the prerender. |
| 2783 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2789 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 2784 PrerenderCancelMainFrameRedirectUnsupportedScheme) { | 2790 PrerenderCancelMainFrameRedirectUnsupportedScheme) { |
| 2785 GURL url = test_server()->GetURL( | 2791 GURL url = test_server()->GetURL( |
| 2786 CreateServerRedirect("invalidscheme://www.google.com/test.html")); | 2792 CreateServerRedirect("invalidscheme://www.google.com/test.html")); |
| 2787 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); | 2793 PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 1); |
| 2788 NavigateToDestURL(); | 2794 NavigateToDestURL(); |
| 2789 } | 2795 } |
| 2790 | 2796 |
| 2791 } // namespace prerender | 2797 } // namespace prerender |
| OLD | NEW |