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

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

Issue 2916933002: Re-commit "win: Set is_clang=true by default" over the weekend. (Closed)
Patch Set: third_party/WebKit/Tools/Scripts/webkit-patch rebaseline-cl Created 3 years, 6 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
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 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 2002
2003 // Checks that scripts can retrieve the correct window size while prerendering. 2003 // Checks that scripts can retrieve the correct window size while prerendering.
2004 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { 2004 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) {
2005 PrerenderTestURL("/prerender/prerender_size.html", FINAL_STATUS_USED, 1); 2005 PrerenderTestURL("/prerender/prerender_size.html", FINAL_STATUS_USED, 1);
2006 NavigateToDestURL(); 2006 NavigateToDestURL();
2007 } 2007 }
2008 2008
2009 // TODO(jam): http://crbug.com/350550 2009 // TODO(jam): http://crbug.com/350550
2010 #if !(defined(OS_CHROMEOS) && defined(ADDRESS_SANITIZER)) 2010 #if !(defined(OS_CHROMEOS) && defined(ADDRESS_SANITIZER))
2011 2011
2012 // TODO(hans): Temporarily disable while enabling Clang by default on Windows
2013 // over the weekend. (crbug.com/727458)
2014 #if !(defined(OS_WIN) && defined(__clang__))
2015
2012 // Checks that prerenderers will terminate when the RenderView crashes. 2016 // Checks that prerenderers will terminate when the RenderView crashes.
2013 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { 2017 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
2014 std::unique_ptr<TestPrerender> prerender = PrerenderTestURL( 2018 std::unique_ptr<TestPrerender> prerender = PrerenderTestURL(
2015 "/prerender/prerender_page.html", FINAL_STATUS_RENDERER_CRASHED, 1); 2019 "/prerender/prerender_page.html", FINAL_STATUS_RENDERER_CRASHED, 1);
2016 2020
2017 // Navigate to about:crash and then wait for the renderer to crash. 2021 // Navigate to about:crash and then wait for the renderer to crash.
2018 ASSERT_TRUE(prerender->contents()); 2022 ASSERT_TRUE(prerender->contents());
2019 ASSERT_TRUE(prerender->contents()->prerender_contents()); 2023 ASSERT_TRUE(prerender->contents()->prerender_contents());
2020 prerender->contents()->prerender_contents()->GetController(). 2024 prerender->contents()->prerender_contents()->GetController().
2021 LoadURL( 2025 LoadURL(
2022 GURL(content::kChromeUICrashURL), 2026 GURL(content::kChromeUICrashURL),
2023 content::Referrer(), 2027 content::Referrer(),
2024 ui::PAGE_TRANSITION_TYPED, 2028 ui::PAGE_TRANSITION_TYPED,
2025 std::string()); 2029 std::string());
2026 prerender->WaitForStop(); 2030 prerender->WaitForStop();
2027 } 2031 }
2028 #endif 2032 #endif
2033 #endif
2029 2034
2030 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 2035 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
2031 PrerenderPageWithFragment) { 2036 PrerenderPageWithFragment) {
2032 PrerenderTestURL("/prerender/prerender_page.html#fragment", FINAL_STATUS_USED, 2037 PrerenderTestURL("/prerender/prerender_page.html#fragment", FINAL_STATUS_USED,
2033 1); 2038 1);
2034 2039
2035 ChannelDestructionWatcher channel_close_watcher; 2040 ChannelDestructionWatcher channel_close_watcher;
2036 channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> 2041 channel_close_watcher.WatchChannel(browser()->tab_strip_model()->
2037 GetActiveWebContents()->GetRenderProcessHost()); 2042 GetActiveWebContents()->GetRenderProcessHost());
2038 NavigateToDestURL(); 2043 NavigateToDestURL();
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
3928 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, 3933 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents,
3929 "DidDisplayReallyPass()", 3934 "DidDisplayReallyPass()",
3930 &display_test_result)); 3935 &display_test_result));
3931 ASSERT_TRUE(display_test_result); 3936 ASSERT_TRUE(display_test_result);
3932 } 3937 }
3933 #endif // !defined(DISABLE_NACL) 3938 #endif // !defined(DISABLE_NACL)
3934 3939
3935 } // namespace prerender 3940 } // namespace prerender
3936 3941
3937 #endif // !defined(OS_MACOSX) || !defined(ADDRESS_SANITIZER) 3942 #endif // !defined(OS_MACOSX) || !defined(ADDRESS_SANITIZER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698