DevTools: get rid of WebInspector.cssModel, use target models instead

Source/devtools/front_end/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 479 matching lines @@
 
     // Reload inspected page to sniff network events
     test.evaluateInConsole_("window.location.reload(true);", function(resultText) {});
 
     this.takeControl();
 };
 
 
 TestSuite.prototype.testConsoleOnNavigateBack = function()
 {
-    if (WebInspector.consoleModel.messages.length === 1)
+    if (WebInspector.multitargetConsoleModel.messages().length === 1)
         firstConsoleMessageReceived.call(this);
     else
-        WebInspector.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+        WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
 
     function firstConsoleMessageReceived() {
-        WebInspector.consoleModel.removeEventListener(WebInspector.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+        WebInspector.multitargetConsoleModel.removeEventListener(WebInspector.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
         this.evaluateInConsole_("clickLink();", didClickLink.bind(this));
     }
 
     function didClickLink() {
         // Check that there are no new messages(command is not a message).
-        this.assertEquals(3, WebInspector.consoleModel.messages.length);
+        this.assertEquals(3, WebInspector.multitargetConsoleModel.messages().length);
         this.evaluateInConsole_("history.back();", didNavigateBack.bind(this));
     }
 
     function didNavigateBack()
     {
         // Make sure navigation completed and possible console messages were pushed.
         this.evaluateInConsole_("void 0;", didCompleteNavigation.bind(this));
     }
 
     function didCompleteNavigation() {
-        this.assertEquals(7, WebInspector.consoleModel.messages.length);
+        this.assertEquals(7, WebInspector.multitargetConsoleModel.messages().length);
         this.releaseControl();
     }
 
     this.takeControl();
 };
 
 TestSuite.prototype.testReattachAfterCrash = function()
 {
     PageAgent.navigate("about:crash");
     PageAgent.navigate("about:blank");
@@ skipping 56 matching lines @@
         test.assertTrue(frameCount >= 5, "Not enough frames");
         test.releaseControl();
     }
 
     step1();
     test.takeControl();
 }
 
 TestSuite.prototype.enableTouchEmulation = function()
 {
-    WebInspector.targetManager.activeTarget().domModel.emulateTouchEventObjects(true);
+    WebInspector.targetManager.mainTarget().domModel.emulateTouchEventObjects(true);
 };
 
 // Regression test for http://webk.it/97466
 TestSuite.prototype.testPageOverlayUpdate = function()
 {
     var test = this;
     WebInspector.inspectorView.panel("elements");
 
     function populatePage()
     {
@@ skipping 147 matching lines @@
 }
 
 
 TestSuite.prototype.stopTimeline = function()
 {
     this.evaluateInConsole_("console.timeStamp('ready')", function() {});
 }
 
 TestSuite.prototype.waitForTestResultsInConsole = function()
 {
-    var messages = WebInspector.consoleModel.messages;
+    var messages = WebInspector.multitargetConsoleModel.messages();
     for (var i = 0; i < messages.length; ++i) {
         var text = messages[i].messageText;
         if (text === "PASS")
             return;
         else if (/^FAIL/.test(text))
             this.fail(text); // This will throw.
     }
     // Neither PASS nor FAIL, so wait for more messages.
     function onConsoleMessage(event)
     {
         var text = event.data.messageText;
         if (text === "PASS")
             this.releaseControl();
         else if (/^FAIL/.test(text))
             this.fail(text);
     }
 
-    WebInspector.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+    WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
     this.takeControl();
 };
 
 TestSuite.prototype.checkLogAndErrorMessages = function()
 {
-    var messages = WebInspector.consoleModel.messages;
+    var messages = WebInspector.multitargetConsoleModel.messages();
 
     var matchesCount = 0;
     function validMessage(message)
     {
         if (message.text === "log" && message.level === WebInspector.ConsoleMessage.MessageLevel.Log) {
             ++matchesCount;
             return true;
         }
 
         if (message.text === "error" && message.level === WebInspector.ConsoleMessage.MessageLevel.Error) {
@@ skipping 18 matching lines @@
         var message = event.data;
         if (validMessage(message)) {
             if (matchesCount === 2) {
                 this.releaseControl();
                 return;
             }
         } else
             this.fail(message.text + ":" + messages[i].level);
     }
 
-    WebInspector.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+    WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
     this.takeControl();
 };
 
 /**
  * Serializes array of uiSourceCodes to string.
  * @param {!Array.<!WebInspectorUISourceCode>} uiSourceCodes
  * @return {string}
  */
 TestSuite.prototype.uiSourceCodesToString_ = function(uiSourceCodes)
 {
@@ skipping 29 matching lines @@
 /*
  * Evaluates the code in the console as if user typed it manually and invokes
  * the callback when the result message is received and added to the console.
  * @param {string} code
  * @param {function(string)} callback
  */
 TestSuite.prototype.evaluateInConsole_ = function(code, callback)
 {
     function innerEvaluate()
     {
-        WebInspector.consoleModel.show();
+        WebInspector.console.show();
         var consoleView = WebInspector.ConsolePanel._view();
         consoleView._prompt.text = code;
         consoleView._promptElement.dispatchEvent(TestSuite.createKeyEvent("Enter"));
 
         this.addSniffer(WebInspector.ConsoleView.prototype, "_showConsoleMessage",
             function(viewMessage) {
                 callback(viewMessage.toMessageElement().textContent);
             }.bind(this));
     }
 
@@ skipping 140 matching lines @@
 var oldLoadCompleted = InspectorFrontendAPI.loadCompleted;
 InspectorFrontendAPI.loadCompleted = function()
 {
     oldLoadCompleted.call(InspectorFrontendAPI);
     runTests();
 }
 
 })();
 
 }