| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "content/public/browser/devtools_client_host.h" | 47 #include "content/public/browser/devtools_client_host.h" |
| 48 #include "content/public/browser/devtools_manager.h" | 48 #include "content/public/browser/devtools_manager.h" |
| 49 #include "content/public/browser/notification_service.h" | 49 #include "content/public/browser/notification_service.h" |
| 50 #include "content/public/browser/render_process_host.h" | 50 #include "content/public/browser/render_process_host.h" |
| 51 #include "content/public/browser/render_view_host.h" | 51 #include "content/public/browser/render_view_host.h" |
| 52 #include "content/public/browser/web_contents.h" | 52 #include "content/public/browser/web_contents.h" |
| 53 #include "content/public/common/url_constants.h" | 53 #include "content/public/common/url_constants.h" |
| 54 #include "content/public/test/browser_test_utils.h" | 54 #include "content/public/test/browser_test_utils.h" |
| 55 #include "content/public/test/test_navigation_observer.h" | 55 #include "content/public/test/test_navigation_observer.h" |
| 56 #include "content/public/test/test_utils.h" | 56 #include "content/public/test/test_utils.h" |
| 57 #include "extensions/common/switches.h" |
| 57 #include "grit/generated_resources.h" | 58 #include "grit/generated_resources.h" |
| 58 #include "net/dns/mock_host_resolver.h" | 59 #include "net/dns/mock_host_resolver.h" |
| 59 #include "net/url_request/url_request_context.h" | 60 #include "net/url_request/url_request_context.h" |
| 60 #include "net/url_request/url_request_context_getter.h" | 61 #include "net/url_request/url_request_context_getter.h" |
| 61 #include "net/url_request/url_request_filter.h" | 62 #include "net/url_request/url_request_filter.h" |
| 62 #include "net/url_request/url_request_job.h" | 63 #include "net/url_request/url_request_job.h" |
| 63 #include "ui/base/l10n/l10n_util.h" | 64 #include "ui/base/l10n/l10n_util.h" |
| 64 #include "url/gurl.h" | 65 #include "url/gurl.h" |
| 65 | 66 |
| 66 using content::BrowserThread; | 67 using content::BrowserThread; |
| (...skipping 2690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2757 } | 2758 } |
| 2758 }; | 2759 }; |
| 2759 | 2760 |
| 2760 // http://crbug.com/177163 | 2761 // http://crbug.com/177163 |
| 2761 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, | 2762 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, |
| 2762 DISABLED_WebNavigation) { | 2763 DISABLED_WebNavigation) { |
| 2763 ASSERT_TRUE(StartEmbeddedTestServer()); | 2764 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 2764 extensions::FrameNavigationState::set_allow_extension_scheme(true); | 2765 extensions::FrameNavigationState::set_allow_extension_scheme(true); |
| 2765 | 2766 |
| 2766 CommandLine::ForCurrentProcess()->AppendSwitch( | 2767 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 2767 switches::kAllowLegacyExtensionManifests); | 2768 extensions::switches::kAllowLegacyExtensionManifests); |
| 2768 | 2769 |
| 2769 // Wait for the extension to set itself up and return control to us. | 2770 // Wait for the extension to set itself up and return control to us. |
| 2770 ASSERT_TRUE( | 2771 ASSERT_TRUE( |
| 2771 RunExtensionSubtest("webnavigation", "test_prerender.html")) << message_; | 2772 RunExtensionSubtest("webnavigation", "test_prerender.html")) << message_; |
| 2772 | 2773 |
| 2773 ResultCatcher catcher; | 2774 ResultCatcher catcher; |
| 2774 | 2775 |
| 2775 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2776 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
| 2776 | 2777 |
| 2777 ChannelDestructionWatcher channel_close_watcher; | 2778 ChannelDestructionWatcher channel_close_watcher; |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2893 | 2894 |
| 2894 // Checks that media source video loads are deferred on prerendering. | 2895 // Checks that media source video loads are deferred on prerendering. |
| 2895 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5MediaSourceVideo) { | 2896 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5MediaSourceVideo) { |
| 2896 PrerenderTestURL("files/prerender/prerender_html5_video_media_source.html", | 2897 PrerenderTestURL("files/prerender/prerender_html5_video_media_source.html", |
| 2897 FINAL_STATUS_USED, | 2898 FINAL_STATUS_USED, |
| 2898 1); | 2899 1); |
| 2899 NavigateToDestUrlAndWaitForPassTitle(); | 2900 NavigateToDestUrlAndWaitForPassTitle(); |
| 2900 } | 2901 } |
| 2901 | 2902 |
| 2902 } // namespace prerender | 2903 } // namespace prerender |
| OLD | NEW |