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

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

Issue 7553009: Add some browser tests for net-internals (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Just test result of first test 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
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/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1545 tab_contents())); 1545 tab_contents()));
1546 NavigateToDestURL(); 1546 NavigateToDestURL();
1547 favicon_update_watcher.Wait(); 1547 favicon_update_watcher.Wait();
1548 } 1548 }
1549 1549
1550 // Checks that when a prerendered page is swapped in to a referring page, the 1550 // Checks that when a prerendered page is swapped in to a referring page, the
1551 // unload handlers on the referring page are executed. 1551 // unload handlers on the referring page are executed.
1552 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) { 1552 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) {
1553 set_loader_path("files/prerender/prerender_loader_with_unload.html"); 1553 set_loader_path("files/prerender/prerender_loader_with_unload.html");
1554 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); 1554 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
1555 string16 expected_title = ASCIIToUTF16("Unloaded");
1555 ui_test_utils::TitleWatcher title_watcher(browser()->GetSelectedTabContents(), 1556 ui_test_utils::TitleWatcher title_watcher(browser()->GetSelectedTabContents(),
1556 ASCIIToUTF16("Unloaded")); 1557 expected_title);
1557 NavigateToDestURL(); 1558 NavigateToDestURL();
1558 EXPECT_TRUE(title_watcher.Wait()); 1559 EXPECT_EQ(expected_title, title_watcher.Wait());
1559 } 1560 }
1560 1561
1561 // Checks that when the history is cleared, prerendering is cancelled and 1562 // Checks that when the history is cleared, prerendering is cancelled and
1562 // prerendering history is cleared. 1563 // prerendering history is cleared.
1563 // DISABLED: http://www.crbug.com/86829 1564 // DISABLED: http://www.crbug.com/86829
1564 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderClearHistory) { 1565 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderClearHistory) {
1565 PrerenderTestURL("files/prerender/prerender_page.html", 1566 PrerenderTestURL("files/prerender/prerender_page.html",
1566 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1567 FINAL_STATUS_CACHE_OR_HISTORY_CLEARED,
1567 1); 1568 1);
1568 1569
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 1); 1603 1);
1603 // Post a task to cancel all the prerenders. 1604 // Post a task to cancel all the prerenders.
1604 MessageLoop::current()->PostTask(FROM_HERE, 1605 MessageLoop::current()->PostTask(FROM_HERE,
1605 NewRunnableFunction(CancelAllPrerenders, 1606 NewRunnableFunction(CancelAllPrerenders,
1606 prerender_manager())); 1607 prerender_manager()));
1607 ui_test_utils::RunMessageLoop(); 1608 ui_test_utils::RunMessageLoop();
1608 EXPECT_TRUE(GetPrerenderContents() == NULL); 1609 EXPECT_TRUE(GetPrerenderContents() == NULL);
1609 } 1610 }
1610 1611
1611 } // namespace prerender 1612 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698