DevTools: restore devtools tests.

BUG=515032
TBR=yurys


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35276 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 7 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index fea0a63..1984f94 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -409,7 +409,7 @@ WebInspector.UIString = function(string) {
 (function () {
 var orig = InjectedScriptAccess.getProperties;
 InjectedScriptAccess.getProperties = function(
-    objectProxy, ignoreHasOwnProperty, callback) {
+    objectProxy, ignoreHasOwnProperty, abbreviate, callback) {
   if (objectProxy.isScope) {
     devtools.tools.getDebuggerAgent().resolveScope(objectProxy.objectId,
         callback);
diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js
index 6d6b890..3186b1b 100644
--- a/webkit/glue/devtools/js/tests.js
+++ b/webkit/glue/devtools/js/tests.js
@@ -1115,14 +1115,11 @@ TestSuite.prototype._waitForScriptPause = function(expectations, callback) {
       WebInspector,
       'pausedScript',
       function(callFrames) {
-        test.assertEquals(expectations.functionsOnStack.length,
-                          callFrames.length,
-                          'Unexpected stack depth');
-
         var functionsOnStack = [];
         for (var i = 0; i < callFrames.length; i++) {
           functionsOnStack.push(callFrames[i].functionName);
         }
+
         test.assertEquals(
             expectations.functionsOnStack.join(','),
             functionsOnStack.join(','), 'Unexpected stack.');
@@ -1598,8 +1595,8 @@ TestSuite.prototype._findChildProperty = function(
 TestSuite.prototype._hookGetPropertiesCallback = function(hook, code) {
   var orig = InjectedScriptAccess.getProperties;
   InjectedScriptAccess.getProperties = function(objectProxy,
-      ignoreHasOwnProperty, callback) {
-    orig.call(InjectedScriptAccess, objectProxy, ignoreHasOwnProperty,
+      ignoreHasOwnProperty, abbreviate, callback) {
+    orig.call(InjectedScriptAccess, objectProxy, ignoreHasOwnProperty, abbreviate,
         function() {
           callback.apply(this, arguments);
           hook();