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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 11607012: Add tabs.onReplaced event to notify listeners of tabs being swapped due to prerendering or instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add tests Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/event_names.cc ('k') | chrome/common/extensions/api/tabs.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 601fa246882357c2f0e268847334926bd7f58ae5..b6d5c07e18ec239a3683d75d20fdf1eb5ed815f9 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -2597,7 +2597,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) {
NavigateToDestURL();
}
-// Test interaction of the webNavigation API with prerender.
+// Test interaction of the webNavigation and tabs API with prerender.
class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest,
public ExtensionApiTest {
public:
@@ -2652,4 +2652,29 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) {
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
}
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) {
+ // PrerenderBrowserTest automatically started a test server. Restart it, so
+ // ExtensionApiTest can register its test parameters.
+ test_server()->Stop();
Matt Perry 2013/01/04 00:21:07 This is a little janky. Can you make it an option
justinlin 2013/01/04 12:43:50 Done.
+ ASSERT_TRUE(StartTestServer());
+ extensions::FrameNavigationState::set_allow_extension_scheme(true);
+
+ // Wait for the extension to set itself up and return control to us.
+ ASSERT_TRUE(RunExtensionSubtest("tabs/on_replaced", "on_replaced.html"))
+ << message_;
+
+ ResultCatcher catcher;
+
+ PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
+
+ ChannelDestructionWatcher channel_close_watcher;
+ channel_close_watcher.WatchChannel(
+ chrome::GetActiveWebContents(browser())->GetRenderProcessHost());
+ NavigateToDestURL();
+ channel_close_watcher.WaitForChannelClose();
+
+ ASSERT_TRUE(IsEmptyPrerenderLinkManager());
+ ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
} // namespace prerender
« no previous file with comments | « chrome/browser/extensions/event_names.cc ('k') | chrome/common/extensions/api/tabs.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698