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

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

Issue 10383268: Mark PrerenderBrowserTest.PrerenderUnload as flaky on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 <deque> 5 #include <deque>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after
2014 ui_test_utils::WindowedNotificationObserver favicon_update_watcher( 2014 ui_test_utils::WindowedNotificationObserver favicon_update_watcher(
2015 chrome::NOTIFICATION_FAVICON_UPDATED, 2015 chrome::NOTIFICATION_FAVICON_UPDATED,
2016 content::Source<WebContents>(prerender_contents->prerender_contents()-> 2016 content::Source<WebContents>(prerender_contents->prerender_contents()->
2017 web_contents())); 2017 web_contents()));
2018 NavigateToDestURL(); 2018 NavigateToDestURL();
2019 favicon_update_watcher.Wait(); 2019 favicon_update_watcher.Wait();
2020 } 2020 }
2021 2021
2022 // Checks that when a prerendered page is swapped in to a referring page, the 2022 // Checks that when a prerendered page is swapped in to a referring page, the
2023 // unload handlers on the referring page are executed. 2023 // unload handlers on the referring page are executed.
2024 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) { 2024 #if defined(OS_WIN)
2025 #define MAYBE_PrerenderUnload FLAKY_PrerenderUnload
2026 #else
2027 #define MAYBE_PrerenderUnload PrerenderUnload
2028 #endif
2029 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderUnload) {
2025 set_loader_path("files/prerender/prerender_loader_with_unload.html"); 2030 set_loader_path("files/prerender/prerender_loader_with_unload.html");
2026 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); 2031 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
2027 string16 expected_title = ASCIIToUTF16("Unloaded"); 2032 string16 expected_title = ASCIIToUTF16("Unloaded");
2028 ui_test_utils::TitleWatcher title_watcher( 2033 ui_test_utils::TitleWatcher title_watcher(
2029 current_browser()->GetSelectedWebContents(), expected_title); 2034 current_browser()->GetSelectedWebContents(), expected_title);
2030 NavigateToDestURL(); 2035 NavigateToDestURL();
2031 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 2036 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
2032 } 2037 }
2033 2038
2034 // Checks that when the history is cleared, prerendering is cancelled and 2039 // Checks that when the history is cleared, prerendering is cancelled and
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
2243 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { 2248 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) {
2244 set_use_https_src(true); 2249 set_use_https_src(true);
2245 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); 2250 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html");
2246 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", 2251 PrerenderTestURL("files/prerender/prerender_referrer_policy.html",
2247 FINAL_STATUS_USED, 2252 FINAL_STATUS_USED,
2248 1); 2253 1);
2249 NavigateToDestURL(); 2254 NavigateToDestURL();
2250 } 2255 }
2251 2256
2252 } // namespace prerender 2257 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698