DevTools: fix failing interactive tests. A follow-up of r36518

TBR=pfeldman

Review URL: http://codereview.chromium.org/551067

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

1 files changed, 14 insertions, 0 deletions

diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index e836e12..d106b07 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -1049,8 +1049,15 @@ devtools.DebuggerAgent.prototype.formatCallFrame_ = function(stackFrame) {
   for (var i = 0; i < stackFrame.scopes.length; i++) {
     var scope = stackFrame.scopes[i];
     scope.frameNumber = stackFrame.index;
+    // TODO(yurys): remove when webkit.org/b/32554 is landed.
+    if (InjectedScriptAccess.getDefault) {
     var scopeObjectProxy = new WebInspector.ObjectProxy(0, scope, [], 0, '',
                                                         true);
+    } else {
+    var scopeObjectProxy = new WebInspector.ObjectProxy(scope, [], 0, '',
+                                                        true);
+    }
+
     scopeObjectProxy.isScope = true;
     switch(scope.type) {
       case ScopeType.Global:
@@ -1151,8 +1158,15 @@ devtools.DebuggerAgent.formatObjectProxy_ = function(v) {
   } else {
     description = '<unresolved ref: ' + v.ref + ', type: ' + v.type + '>';
   }
+
+  // TODO(yurys): remove when webkit.org/b/32554 is landed.
+  if (InjectedScriptAccess.getDefault) {
   var proxy = new WebInspector.ObjectProxy(0, v, [], 0, description,
                                            hasChildren);
+  } else {
+  var proxy = new WebInspector.ObjectProxy(v, [], 0, description,
+                                           hasChildren);
+  }
   proxy.type = v.type;
   proxy.isV8Ref = true;
   return proxy;