| Index: third_party/WebKit/Source/devtools/front_end/Tests.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/Tests.js b/third_party/WebKit/Source/devtools/front_end/Tests.js
|
| index e1c8f01ffbeedad4dbe781d87dcc0f8e430566c9..7d10d989b3266dd92a1a64f8f527759b3f9a071b 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/Tests.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/Tests.js
|
| @@ -514,19 +514,23 @@
|
| TestSuite.prototype.testConsoleOnNavigateBack = function() {
|
|
|
| function filteredMessages() {
|
| - return SDK.consoleModel.messages().filter(a => a.source !== SDK.ConsoleMessage.MessageSource.Violation);
|
| + return ConsoleModel.consoleModel.messages().filter(
|
| + a => a.source !== ConsoleModel.ConsoleMessage.MessageSource.Violation);
|
| }
|
|
|
| - if (filteredMessages().length === 1)
|
| + if (filteredMessages().length === 1) {
|
| firstConsoleMessageReceived.call(this, null);
|
| - else
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
|
| + } else {
|
| + ConsoleModel.consoleModel.addEventListener(
|
| + ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
|
| + }
|
|
|
|
|
| function firstConsoleMessageReceived(event) {
|
| - if (event && event.data.source === SDK.ConsoleMessage.MessageSource.Violation)
|
| + if (event && event.data.source === ConsoleModel.ConsoleMessage.MessageSource.Violation)
|
| return;
|
| - SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
|
| + ConsoleModel.consoleModel.removeEventListener(
|
| + ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
|
| this.evaluateInConsole_('clickLink();', didClickLink.bind(this));
|
| }
|
|
|
| @@ -682,12 +686,13 @@
|
|
|
| messages.splice(index, 1);
|
| if (!messages.length) {
|
| - SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| + ConsoleModel.consoleModel.removeEventListener(
|
| + ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| next();
|
| }
|
| }
|
|
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| + ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| SDK.multitargetNetworkManager.setNetworkConditions(preset);
|
| }
|
|
|
| @@ -832,7 +837,7 @@
|
| };
|
|
|
| TestSuite.prototype.testWindowInitializedOnNavigateBack = function() {
|
| - var messages = SDK.consoleModel.messages();
|
| + var messages = ConsoleModel.consoleModel.messages();
|
| this.assertEquals(1, messages.length);
|
| var text = messages[0].messageText;
|
| if (text.indexOf('Uncaught') !== -1)
|
| @@ -867,7 +872,7 @@
|
| };
|
|
|
| TestSuite.prototype.waitForTestResultsInConsole = function() {
|
| - var messages = SDK.consoleModel.messages();
|
| + var messages = ConsoleModel.consoleModel.messages();
|
| for (var i = 0; i < messages.length; ++i) {
|
| var text = messages[i].messageText;
|
| if (text === 'PASS')
|
| @@ -884,7 +889,7 @@
|
| this.fail(text);
|
| }
|
|
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| + ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
|
| this.takeControl();
|
| };
|
|
|
| @@ -928,12 +933,12 @@
|
| Array.prototype.slice.call(arguments, 1, -1).map(arg => JSON.stringify(arg)).join(',') + ',';
|
| this.evaluateInConsole_(
|
| `${functionName}(${argsString} function() { console.log('${doneMessage}'); });`, function() {});
|
| - SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
|
| + ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
|
|
|
| function onConsoleMessage(event) {
|
| var text = event.data.messageText;
|
| if (text === doneMessage) {
|
| - SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
|
| + ConsoleModel.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
|
| callback();
|
| }
|
| }
|
|
|