Revert of [DevTools] Use InspectorFrontendHost.readyForTest for layout tests.

third_party/WebKit/Source/devtools/front_end/main/Main.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 300 matching lines @@
             WebInspector.RemoteDebuggingTerminatedScreen.show(event.data.reason);
         }
 
         var targetType = Runtime.queryParam("isSharedWorker") ? WebInspector.Target.Type.ServiceWorker : WebInspector.Target.Type.Page;
         this._mainTarget = WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), targetType, connection, null);
         console.timeStamp("Main._mainTargetCreated");
         this._registerShortcuts();
 
         this._mainTarget.registerInspectorDispatcher(this);
         InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ReloadInspectedPage, this._reloadInspectedPage, this);
-        InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this);
 
         if (this._mainTarget.isServiceWorker() || this._mainTarget.isPage())
             this._mainTarget.runtimeAgent().run();
 
-        this._mainTarget.inspectorAgent().enable();
-        InspectorFrontendHost.readyForTest();
+        this._mainTarget.inspectorAgent().enable(inspectorAgentEnableCallback);
 
-        // Asynchronously run the extensions.
-        setTimeout(lateInitialization, 0);
+        function inspectorAgentEnableCallback()
+        {
+            console.timeStamp("Main.inspectorAgentEnableCallback");
+            InspectorFrontendHost.readyForTest();
+            // Asynchronously run the extensions.
+            setTimeout(lateInitialization, 0);
+        }
 
         function lateInitialization()
         {
-            console.timeStamp("Main.lateInitialization");
             WebInspector.extensionServer.initializeExtensions();
         }
     },
 
     _registerForwardedShortcuts: function()
     {
         /** @const */ var forwardedActions = ["main.toggle-dock", "debugger.toggle-breakpoints-active", "debugger.toggle-pause", "commandMenu.show"];
         var actionKeys = WebInspector.shortcutRegistry.keysForActions(forwardedActions).map(WebInspector.KeyboardShortcut.keyCodeAndModifiersFromKey);
         InspectorFrontendHost.setWhitelistedShortcuts(JSON.stringify(actionKeys));
     },
@@ skipping 257 matching lines @@
             WebInspector.TargetCrashedScreen.show(debuggerModel);
     },
 
     _onSuspendStateChanged: function()
     {
         var suspended = WebInspector.targetManager.allTargetsSuspended();
         WebInspector.inspectorView.onSuspendStateChanged(suspended);
     },
 
     /**
-     * @param {!WebInspector.Event} event
+     * @override
+     * @param {number} callId
+     * @param {string} script
      */
-    _evaluateForTestInFrontend: function(event)
+    evaluateForTestInFrontend: function(callId, script)
     {
         if (!InspectorFrontendHost.isUnderTest())
             return;
 
-        var callId = /** @type {number} */ (event.data["callId"]);
-        var script = /** @type {number} */ (event.data["script"]);
-
         /**
          * @suppressGlobalPropertiesCheck
          */
         function invokeMethod()
         {
             try {
                 script = script + "//# sourceURL=evaluateInWebInspector" + callId + ".js";
                 window.eval(script);
             } catch (e) {
                 console.error(e.stack);
@@ skipping 506 matching lines @@
      * @return {?Element}
      */
     settingElement: function()
     {
         return WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("Show rulers"), WebInspector.moduleSetting("showMetricsRulers"));
     }
 }
 
 
 new WebInspector.Main();