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

Unified Diff: chrome/browser/ui/webui/net_internals_ui_browsertest.cc

Issue 8892006: Fix reentrancy bug in NetInternalsTest.NetInternalsDnsViewIncognitoClears. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Update comments Created 9 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 | « no previous file | chrome/test/data/webui/net_internals/dns_view.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/net_internals_ui_browsertest.cc
===================================================================
--- chrome/browser/ui/webui/net_internals_ui_browsertest.cc (revision 113807)
+++ chrome/browser/ui/webui/net_internals_ui_browsertest.cc (working copy)
@@ -121,7 +121,8 @@
// there, and that the background tab exists at slot 1.
void NavigateToPrerender(const ListValue* list_value);
- // Creates an incognito browser.
+ // Creates an incognito browser. Once creation is complete, passes a
+ // message to the Javascript test harness.
void CreateIncognitoBrowser(const ListValue* list_value);
// Closes an incognito browser created with CreateIncognitoBrowser.
@@ -264,6 +265,10 @@
const ListValue* list_value) {
ASSERT_FALSE(incognito_browser_);
incognito_browser_ = net_internals_test_->CreateIncognitoBrowser();
+
+ // Tell the test harness that creation is complete.
+ StringValue command_value("onIncognitoBrowserCreatedForTest");
+ web_ui()->CallJavascriptFunction("g_browser.receive", command_value);
}
void NetInternalsTest::MessageHandler::CloseIncognitoBrowser(
@@ -403,11 +408,6 @@
// Makes sure that openning and then closing an incognito window clears the
// DNS cache. To keep things simple, we add a fake cache entry ourselves,
// rather than having the incognito browser create one.
-#if defined(OS_CHROMEOS)
-// http://crbug.com/106707
-#define NetInternalsDnsViewIncognitoClears \
- FLAKY_NetInternalsDnsViewIncognitoClears
-#endif
IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewIncognitoClears) {
EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewIncognitoClears"));
}
« no previous file with comments | « no previous file | chrome/test/data/webui/net_internals/dns_view.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698