Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2687173002: [Prerender] Ignores resources with unsupported schemes for Offline reqs (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_resource_throttle.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 #include <deque> 6 #include <deque>
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <unordered_map> 9 #include <unordered_map>
10 #include <utility> 10 #include <utility>
(...skipping 2805 matching lines...) Expand 10 before | Expand all | Expand 10 after
2816 base::StringPairs replacement_text; 2816 base::StringPairs replacement_text;
2817 replacement_text.push_back( 2817 replacement_text.push_back(
2818 std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); 2818 std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec()));
2819 std::string replacement_path; 2819 std::string replacement_path;
2820 net::test_server::GetFilePathWithReplacements( 2820 net::test_server::GetFilePathWithReplacements(
2821 "/prerender/prerender_with_image.html", replacement_text, 2821 "/prerender/prerender_with_image.html", replacement_text,
2822 &replacement_path); 2822 &replacement_path);
2823 PrerenderTestURL(replacement_path, FINAL_STATUS_UNSUPPORTED_SCHEME, 0); 2823 PrerenderTestURL(replacement_path, FINAL_STATUS_UNSUPPORTED_SCHEME, 0);
2824 } 2824 }
2825 2825
2826 // Checks that non-http/https/chrome-extension subresource does not cancel the
2827 // prerender.
2828 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2829 PrerenderSubresourceUnsupportedSchemeForOffline) {
2830 // Set up a page with unsupported subresource.
2831 GURL image_url = GURL("invalidscheme://www.google.com/test.jpg");
2832 base::StringPairs replacement_text;
2833 replacement_text.push_back(
2834 std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec()));
2835 std::string replacement_path;
2836 net::test_server::GetFilePathWithReplacements(
2837 "/prerender/prerender_with_image.html", replacement_text,
2838 &replacement_path);
2839 const GURL url = src_server()->GetURL(MakeAbsolute(replacement_path));
2840
2841 // Navigate to about:blank to get the session storage namespace.
2842 ui_test_utils::NavigateToURL(current_browser(), GURL(url::kAboutBlankURL));
2843 content::SessionStorageNamespace* storage_namespace =
2844 GetActiveWebContents()
2845 ->GetController()
2846 .GetDefaultSessionStorageNamespace();
2847
2848 std::unique_ptr<TestPrerender> test_prerender =
2849 prerender_contents_factory()->ExpectPrerenderContents(
2850 FINAL_STATUS_APP_TERMINATING);
2851
2852 std::unique_ptr<PrerenderHandle> prerender_handle(
2853 GetPrerenderManager()->AddPrerenderForOffline(url, storage_namespace,
2854 gfx::Size(640, 480)));
2855 ASSERT_EQ(prerender_handle->contents(), test_prerender->contents());
2856 test_prerender->WaitForLoads(1);
2857 }
2858
2826 // Ensure that about:blank is permitted for any subresource. 2859 // Ensure that about:blank is permitted for any subresource.
2827 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 2860 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2828 PrerenderAllowAboutBlankSubresource) { 2861 PrerenderAllowAboutBlankSubresource) {
2829 GURL image_url = GURL("about:blank"); 2862 GURL image_url = GURL("about:blank");
2830 base::StringPairs replacement_text; 2863 base::StringPairs replacement_text;
2831 replacement_text.push_back( 2864 replacement_text.push_back(
2832 std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); 2865 std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec()));
2833 std::string replacement_path; 2866 std::string replacement_path;
2834 net::test_server::GetFilePathWithReplacements( 2867 net::test_server::GetFilePathWithReplacements(
2835 "/prerender/prerender_with_image.html", replacement_text, 2868 "/prerender/prerender_with_image.html", replacement_text,
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
3782 browser()->tab_strip_model()->GetActiveWebContents(); 3815 browser()->tab_strip_model()->GetActiveWebContents();
3783 bool display_test_result = false; 3816 bool display_test_result = false;
3784 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, 3817 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
3785 "DidDisplayReallyPass()", 3818 "DidDisplayReallyPass()",
3786 &display_test_result)); 3819 &display_test_result));
3787 ASSERT_TRUE(display_test_result); 3820 ASSERT_TRUE(display_test_result);
3788 } 3821 }
3789 #endif // !defined(DISABLE_NACL) 3822 #endif // !defined(DISABLE_NACL)
3790 3823
3791 } // namespace prerender 3824 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_resource_throttle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698