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 32107cae6f32a6b177d731b6b03f34f79892669e..e1c8f01ffbeedad4dbe781d87dcc0f8e430566c9 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/Tests.js |
+++ b/third_party/WebKit/Source/devtools/front_end/Tests.js |
@@ -514,22 +514,19 @@ |
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)); |
} |
@@ -685,12 +682,12 @@ |
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); |
} |
@@ -835,7 +832,7 @@ |
}; |
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) |
@@ -870,7 +867,7 @@ |
}; |
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') |
@@ -887,7 +884,7 @@ |
this.fail(text); |
} |
- SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this); |
+ SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this); |
this.takeControl(); |
}; |
@@ -931,12 +928,12 @@ |
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(); |
} |
} |