Fix reentrancy bug in NetInternalsTest.NetInternalsDnsViewIncognitoClears.

chrome/browser/ui/webui/net_internals_ui_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 103 matching lines @@
     // ip address, net error code, and expiration time in days from now
     // as parameters.  If the error code indicates failure, the ip address
     // must be an empty string.
     void AddCacheEntry(const ListValue* list_value);
 
     // Navigates to the prerender in the background tab. This assumes that
     // there is a "Click()" function in the background tab which will navigate
     // 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.
     void CloseIncognitoBrowser(const ListValue* list_value);
 
     Browser* browser() {
       return net_internals_test_->browser();
     }
 
     NetInternalsTest* net_internals_test_;
@@ skipping 122 matching lines @@
 void NetInternalsTest::MessageHandler::NavigateToPrerender(
     const ListValue* list_value) {
   RenderViewHost* host = browser()->GetTabContentsAt(1)->render_view_host();
   host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("Click()"));
 }
 
 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
     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(
     const ListValue* list_value) {
   ASSERT_TRUE(incognito_browser_);
   incognito_browser_->CloseAllTabs();
   // Closing all a Browser's tabs will ultimately result in its destruction,
   // thought it may not have been destroyed yet.
   incognito_browser_ = NULL;
 }
@@ skipping 119 matching lines @@
 }
 
 // Adds two entries to the DNS cache, clears the cache, and then repeats.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewAddTwoTwice) {
   EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice"));
 }
 
 // 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"));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // test_view.js
 ////////////////////////////////////////////////////////////////////////////////
 
 // Runs the test suite twice, expecting a passing result the first time.  Checks
 // the first result, the order of events that occur, and the number of rows in
@@ skipping 115 matching lines @@
 // log_view_painter.js
 ////////////////////////////////////////////////////////////////////////////////
 
 // Check that we correctly remove cookies and login information.
 IN_PROC_BROWSER_TEST_F(NetInternalsTest,
                        NetInternalsLogViewPainterStripInfo) {
   EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo"));
 }
 
 }  // namespace