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

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

Issue 10533066: Disable PrerenderTaskManager. It's flaky on Win (dbg). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 // and not pending. One and only one of the URLs (the last seen) should be the 1479 // and not pending. One and only one of the URLs (the last seen) should be the
1480 // active entry. 1480 // active entry.
1481 bool url_b_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileB); 1481 bool url_b_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileB);
1482 bool url_c_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileC); 1482 bool url_c_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileC);
1483 EXPECT_TRUE((url_b_is_active_prerender || url_c_is_active_prerender) && 1483 EXPECT_TRUE((url_b_is_active_prerender || url_c_is_active_prerender) &&
1484 !(url_b_is_active_prerender && url_c_is_active_prerender)); 1484 !(url_b_is_active_prerender && url_c_is_active_prerender));
1485 EXPECT_FALSE(UrlIsPendingInPrerenderManager(kHtmlFileB)); 1485 EXPECT_FALSE(UrlIsPendingInPrerenderManager(kHtmlFileB));
1486 EXPECT_FALSE(UrlIsPendingInPrerenderManager(kHtmlFileC)); 1486 EXPECT_FALSE(UrlIsPendingInPrerenderManager(kHtmlFileC));
1487 } 1487 }
1488 1488
1489 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) { 1489 // See crbug.com/131836.
1490 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderTaskManager) {
1490 // Show the task manager. This populates the model. 1491 // Show the task manager. This populates the model.
1491 current_browser()->window()->ShowTaskManager(); 1492 current_browser()->window()->ShowTaskManager();
1492 // Wait for the model of task manager to start. 1493 // Wait for the model of task manager to start.
1493 TaskManagerBrowserTestUtil::WaitForResourceChange(2); 1494 TaskManagerBrowserTestUtil::WaitForResourceChange(2);
1494 1495
1495 // Start with two resources. 1496 // Start with two resources.
1496 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); 1497 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
1497 1498
1498 // One of the resources that has a WebContents associated with it should have 1499 // One of the resources that has a WebContents associated with it should have
1499 // the Prerender prefix. 1500 // the Prerender prefix.
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
2246 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { 2247 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) {
2247 set_use_https_src(true); 2248 set_use_https_src(true);
2248 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); 2249 set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html");
2249 PrerenderTestURL("files/prerender/prerender_referrer_policy.html", 2250 PrerenderTestURL("files/prerender/prerender_referrer_policy.html",
2250 FINAL_STATUS_USED, 2251 FINAL_STATUS_USED,
2251 1); 2252 1);
2252 NavigateToDestURL(); 2253 NavigateToDestURL();
2253 } 2254 }
2254 2255
2255 } // namespace prerender 2256 } // 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