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

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

Issue 7622010: Disable PrerenderBrowserTest.BackToPrerenderedPage on win, it times out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing bug number Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/test/test_timeouts.h"
10 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "base/test/test_timeouts.h"
13 #include "chrome/browser/browsing_data_remover.h" 13 #include "chrome/browser/browsing_data_remover.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/favicon/favicon_tab_helper.h" 15 #include "chrome/browser/favicon/favicon_tab_helper.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/prerender/prerender_contents.h" 17 #include "chrome/browser/prerender/prerender_contents.h"
18 #include "chrome/browser/prerender/prerender_manager.h" 18 #include "chrome/browser/prerender/prerender_manager.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 20 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
21 #include "chrome/browser/task_manager/task_manager.h" 21 #include "chrome/browser/task_manager/task_manager.h"
22 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 22 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
(...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1625 FINAL_STATUS_CANCELLED, 1625 FINAL_STATUS_CANCELLED,
1626 1); 1626 1);
1627 // Post a task to cancel all the prerenders. 1627 // Post a task to cancel all the prerenders.
1628 MessageLoop::current()->PostTask(FROM_HERE, 1628 MessageLoop::current()->PostTask(FROM_HERE,
1629 NewRunnableFunction(CancelAllPrerenders, 1629 NewRunnableFunction(CancelAllPrerenders,
1630 prerender_manager())); 1630 prerender_manager()));
1631 ui_test_utils::RunMessageLoop(); 1631 ui_test_utils::RunMessageLoop();
1632 EXPECT_TRUE(GetPrerenderContents() == NULL); 1632 EXPECT_TRUE(GetPrerenderContents() == NULL);
1633 } 1633 }
1634 1634
1635 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, BackToPrerenderedPage) { 1635 // Flaky on windows: http://crbug.com/92478
1636 #if defined(OS_WIN)
1637 #define MAYBE_BackToPrerenderedPage DISABLED_BackToPrerenderedPage
1638 #else
1639 #define MAYBE_BackToPrerenderedPage BackToPrerenderedPage
1640 #endif
1641
1642 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_BackToPrerenderedPage) {
1636 PrerenderTestURL("files/prerender/prerender_page_with_link.html", 1643 PrerenderTestURL("files/prerender/prerender_page_with_link.html",
1637 FINAL_STATUS_USED, 1644 FINAL_STATUS_USED,
1638 1); 1645 1);
1639 1646
1640 OpenDestUrlViaClick(); 1647 OpenDestUrlViaClick();
1641 1648
1642 // Click on the link in the page and wait for it to commit 1649 // Click on the link in the page and wait for it to commit
1643 { 1650 {
1644 ui_test_utils::WindowedNotificationObserver new_page_observer( 1651 ui_test_utils::WindowedNotificationObserver new_page_observer(
1645 content::NOTIFICATION_NAV_ENTRY_COMMITTED, 1652 content::NOTIFICATION_NAV_ENTRY_COMMITTED,
(...skipping 17 matching lines...) Expand all
1663 bool original_prerender_page = false; 1670 bool original_prerender_page = false;
1664 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 1671 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
1665 browser()->GetSelectedTabContents()->render_view_host(), L"", 1672 browser()->GetSelectedTabContents()->render_view_host(), L"",
1666 L"window.domAutomationController.send(IsOriginalPrerenderPage())", 1673 L"window.domAutomationController.send(IsOriginalPrerenderPage())",
1667 &original_prerender_page)); 1674 &original_prerender_page));
1668 EXPECT_TRUE(original_prerender_page); 1675 EXPECT_TRUE(original_prerender_page);
1669 } 1676 }
1670 } 1677 }
1671 1678
1672 } // namespace prerender 1679 } // 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