[DevTools] Turn ConsoleModel into a singleton

third_party/WebKit/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 496 matching lines @@
     this.addSniffer(SDK.NetworkDispatcher.prototype, '_finishNetworkRequest', finishRequest, true);
 
     test.evaluateInConsole_('addImage(\'' + url + '\')', function(resultText) {});
     test.evaluateInConsole_('addImage(\'' + url + '?pushUseNullEndTime\')', function(resultText) {});
     this.takeControl();
   };
 
   TestSuite.prototype.testConsoleOnNavigateBack = function() {
 
     function filteredMessages() {
-      return SDK.multitargetConsoleModel.messages().filter(
-          a => a.source !== SDK.ConsoleMessage.MessageSource.Violation);
+      return SDK.consoleModel.messages().filter(a => a.source !== SDK.ConsoleMessage.MessageSource.Violation);
     }
 
-    if (filteredMessages().length === 1) {
+    if (filteredMessages().length === 1)
       firstConsoleMessageReceived.call(this, null);
-    } else {
-      SDK.multitargetConsoleModel.addEventListener(
-          SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
-    }
+    else
+      SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+
 
     function firstConsoleMessageReceived(event) {
       if (event && event.data.source === SDK.ConsoleMessage.MessageSource.Violation)
         return;
-      SDK.multitargetConsoleModel.removeEventListener(
-          SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+      SDK.consoleModel.removeEventListener(SDK.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, filteredMessages().length);
       this.evaluateInConsole_('history.back();', didNavigateBack.bind(this));
     }
 
     function didNavigateBack() {
@@ skipping 135 matching lines @@
     function testPreset(preset, messages, next) {
       function onConsoleMessage(event) {
         var index = messages.indexOf(event.data.messageText);
         if (index === -1) {
           test.fail('Unexpected message: ' + event.data.messageText);
           return;
         }
 
         messages.splice(index, 1);
         if (!messages.length) {
-          SDK.multitargetConsoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+          SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
           next();
         }
       }
 
-      SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+      SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
       SDK.multitargetNetworkManager.setNetworkConditions(preset);
     }
 
     test.takeControl();
     step1();
 
     function step1() {
       testPreset(
           NetworkConditions.NetworkConditionsSelector.presets[0],
           ['offline event: online = false', 'connection change event: type = none; downlinkMax = 0'], step2);
@@ skipping 124 matching lines @@
       test.assertEquals(1, localSetting.get().n);
       var globalSetting = Common.settings.createSetting('global', undefined);
       test.assertEquals('object', typeof globalSetting.get());
       test.assertEquals('global', globalSetting.get().s);
       test.assertEquals(2, globalSetting.get().n);
       test.releaseControl();
     }
   };
 
   TestSuite.prototype.testWindowInitializedOnNavigateBack = function() {
-    var messages = SDK.multitargetConsoleModel.messages();
+    var messages = SDK.consoleModel.messages();
     this.assertEquals(1, messages.length);
     var text = messages[0].messageText;
     if (text.indexOf('Uncaught') !== -1)
       this.fail(text);
   };
 
   TestSuite.prototype.testConsoleContextNames = function() {
     var test = this;
     test.takeControl();
     this.showPanel('console').then(() => this._waitForExecutionContexts(2, onExecutionContexts.bind(this)));
@@ skipping 14 matching lines @@
     this.takeControl();
     Bindings.TempFile.ensureTempStorageCleared().then(() => this.releaseControl());
   };
 
   TestSuite.prototype.testTempFile = function() {
     this.takeControl();
     Bindings.TempFile.create('test-file', 'test').then(() => this.releaseControl(), error => this.fail(String(error)));
   };
 
   TestSuite.prototype.waitForTestResultsInConsole = function() {
-    var messages = SDK.multitargetConsoleModel.messages();
+    var messages = SDK.consoleModel.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);
     }
 
-    SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
     this.takeControl();
   };
 
   TestSuite.prototype._overrideMethod = function(receiver, methodName, override) {
     var original = receiver[methodName];
     if (typeof original !== 'function') {
       this.fail(`TestSuite._overrideMethod: $[methodName] is not a function`);
       return;
     }
     receiver[methodName] = function() {
@@ skipping 23 matching lines @@
   };
 
   TestSuite.prototype.invokePageFunctionAsync = function(functionName, opt_args, callback_is_always_last) {
     var callback = arguments[arguments.length - 1];
     var doneMessage = `DONE: ${functionName}.${++this._asyncInvocationId}`;
     var argsString = arguments.length < 3 ?
         '' :
         Array.prototype.slice.call(arguments, 1, -1).map(arg => JSON.stringify(arg)).join(',') + ',';
     this.evaluateInConsole_(
         `${functionName}(${argsString} function() { console.log('${doneMessage}'); });`, function() {});
-    SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
+    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
 
     function onConsoleMessage(event) {
       var text = event.data.messageText;
       if (text === doneMessage) {
-        SDK.multitargetConsoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
+        SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
         callback();
       }
     }
   };
 
   TestSuite.prototype.invokeAsyncWithTimeline_ = function(functionName, callback) {
     var test = this;
 
     this.startTimeline(onRecordingStarted);
 
@@ skipping 152 matching lines @@
       if (runtimeModel.executionContexts().length >= n)
         callback.call(null);
       else
         this.addSniffer(SDK.RuntimeModel.prototype, '_executionContextCreated', checkForExecutionContexts.bind(this));
     }
   };
 
 
   window.uiTests = new TestSuite(window.domAutomationController);
 })(window);