Fix reentrancy bug in NetInternalsTest.NetInternalsDnsViewIncognitoClears.

chrome/test/data/webui/net_internals/net_internals_test.js

 // 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.
 
 /**
  * @fileoverview The way these tests work is as follows:
  * C++ in net_internals_ui_browsertest.cc does any necessary setup, and then
  * calls the entry point for a test with RunJavascriptTest.  The called
  * function can then use the assert/expect functions defined in test_api.js.
  * All callbacks from the browser are wrapped in such a way that they can
@@ skipping 406 matching lines @@
 
     /**
      * Runs the function and then completes.
      */
     start: function() {
       this.taskFunction_();
       this.onTaskDone();
     }
   };
 
-  // Creates an incognito window.  May not be called if there already is an
-  // incognito in exitence.  Returns immediately.
-  function getCreateIncognitoBrowserTask() {
-    return new CallFunctionTask(
-        function() {
-          chrome.send('createIncognitoBrowser');
-        });
+  /**
+   * A Task that creates an incognito window and only completes once it has
+   * navigated to about:blank.  The waiting is required to avoid reentrancy
+   * issues, since the function to create the incognito browser also waits
+   * for the navigation to complete.  May not be called if there's already an
+   * incognito browser in existence.
+   * @constructor
+   */
+  function CreateIncognitoBrowserTask() {
+    Task.call(this);
+  }
+
+  CreateIncognitoBrowserTask.prototype = {
+    __proto__: Task.prototype,
+
+    /**
+     * Tells the browser process to create an incognito browser, and sets
+     * up a callback to be called on completion.
+     */
+    start: function() {
+      // Reuse the BrowserBridge's callback mechanism, since it's already
+      // wrapped in our test harness.
+      assertEquals('undefined',
+                   typeof g_browser.onIncognitoBrowserCreatedForTest);
+      g_browser.onIncognitoBrowserCreatedForTest =
+          this.onIncognitoBrowserCreatedForTest.bind(this);
+
+      chrome.send('createIncognitoBrowser');
+    },
+
+    /**
+     * Deletes the callback function, and completes the task.
+     */
+    onIncognitoBrowserCreatedForTest: function() {
+      delete g_browser.onIncognitoBrowserCreatedForTest;
+      this.onTaskDone();
+    }
   };
 
-  // Closes an incognito window created with the task above.  May only be
-  // called if there's an incognito window created by the above function
-  // that has yet to be closed.  Returns immediately.
+  /**
+   * Returns a task that closes an incognito window created with the task
+   * above.  May only be called if there's an incognito window created by
+   * the above function that has yet to be closed.  Returns immediately.
+   * @return {Task} Task that closes incognito browser window.
+   */
   function getCloseIncognitoBrowserTask() {
     return new CallFunctionTask(
         function() {
           chrome.send('closeIncognitoBrowser');
         });
   };
 
   /**
    * Returns true if a node does not have a 'display' property of 'none'.
    * @param {node}: node The node to check.
@@ skipping 74 matching lines @@
     test: test,
     checkStyledTableRows: checkStyledTableRows,
     checkTabHandleVisibility: checkTabHandleVisibility,
     getStyledTableText: getStyledTableText,
     isDisplayed: isDisplayed,
     runTest: runTest,
     switchToView: switchToView,
     TaskQueue: TaskQueue,
     Task: Task,
     CallFunctionTask: CallFunctionTask,
-    getCreateIncognitoBrowserTask: getCreateIncognitoBrowserTask,
+    CreateIncognitoBrowserTask: CreateIncognitoBrowserTask,
     getCloseIncognitoBrowserTask: getCloseIncognitoBrowserTask,
     Source: Source,
     Event: Event,
     CreateBeginEvent: CreateBeginEvent,
     CreateEndEvent: CreateEndEvent,
     CreateMatchingEndEvent: CreateMatchingEndEvent
   };
 })();
 
 netInternalsTest.test('netInternalsDone', function() {
@@ skipping 57 matching lines @@
   HostResolverInfoObserver.prototype.onHostResolverInfoChanged = function() {
     assertNotReached();
   };
 
   // Create the observer and add it to |g_browser|.
   g_browser.addHostResolverInfoObserver(new HostResolverInfoObserver());
 
   // Needed to trigger an update.
   netInternalsTest.switchToView('dns');
 });