[DevTools] Prepare to pass modified InspectorFrontendHost to inspector app.

Source/devtools/front_end/main/Tests.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 
 /**
  * @fileoverview This file contains small testing framework along with the
  * test suite for the frontend. These tests are a part of the continues build
  * and are executed by the devtools_sanity_unittest.cc as a part of the
  * Interactive UI Test suite.
  * FIXME: change field naming style to use trailing underscore.
  */
 
-if (window.domAutomationController) {
+function createTestSuite(domAutomationController)
+{
 
 var ___interactiveUiTestsMode = true;
 
 /**
  * Test suite for interactive UI tests.
  * @constructor
  */
-TestSuite = function()
+function TestSuite()
 {
     this.controlTaken_ = false;
     this.timerId_ = -1;
 };
 
 
 /**
  * Reports test failure.
  * @param {string} message Failure description.
  */
@@ skipping 82 matching lines @@
     }
     this.reportOk_();
 };
 
 
 /**
  * Async tests use this one to report that they are completed.
  */
 TestSuite.prototype.reportOk_ = function()
 {
-    window.domAutomationController.send("[OK]");
+    domAutomationController.send("[OK]");
 };
 
 
 /**
  * Async tests use this one to report failures.
  */
 TestSuite.prototype.reportFailure_ = function(error)
 {
     if (this.timerId_ !== -1) {
         clearTimeout(this.timerId_);
         this.timerId_ = -1;
     }
-    window.domAutomationController.send("[FAILED] " + error);
+    domAutomationController.send("[FAILED] " + error);
 };
 
 
 /**
  * Runs all global functions starting with "test" as unit tests.
  */
 TestSuite.prototype.runTest = function(testName)
 {
     try {
         this[testName]();
@@ skipping 723 matching lines @@
  */
 TestSuite.createKeyEvent = function(keyIdentifier)
 {
     var evt = document.createEvent("KeyboardEvent");
     evt.initKeyboardEvent("keydown", true /* can bubble */, true /* can cancel */, null /* view */, keyIdentifier, "");
     return evt;
 };
 
 
 /**
- * Test runner for the test suite.
- */
-var uiTests = {};
-
-
-/**
  * Run each test from the test suit on a fresh instance of the suite.
  */
-uiTests.runAllTests = function()
+TestSuite._runAllTests = function()
 {
     // For debugging purposes.
     for (var name in TestSuite.prototype) {
         if (name.substring(0, 4) === "test" && typeof TestSuite.prototype[name] === "function")
-            uiTests.runTest(name);
+            TestSuite._runTest(name);
     }
 };
 
 
 /**
  * Run specified test on a fresh instance of the test suite.
  * @param {string} name Name of a test method from TestSuite class.
  */
-uiTests.runTest = function(name)
+TestSuite._runTest = function(name)
 {
-    if (uiTests._populatedInterface)
+    if (TestSuite._populatedInterface)
         new TestSuite().runTest(name);
     else
-        uiTests._pendingTestName = name;
+        TestSuite._pendingTestName = name;
 };
 
-(function() {
-
 function runTests()
 {
-    uiTests._populatedInterface = true;
-    var name = uiTests._pendingTestName;
-    delete uiTests._pendingTestName;
+    TestSuite._populatedInterface = true;
+    var name = TestSuite._pendingTestName;
+    delete TestSuite._pendingTestName;
     if (name)
         new TestSuite().runTest(name);
 }
 
 WebInspector.notifications.addEventListener(WebInspector.NotificationService.Events.InspectorAgentEnabledForTests, runTests);
 
-})();
+return TestSuite;
 
 }
+
+if (window.parent && window.parent.uiTests)
+    window.parent.uiTests.testSuiteReady(createTestSuite);