DevTools: enable DevToolsSanityTest.TestCompletionOnPause that failed because WebKit@49557 was not rolled.

BUG=24805
Review URL: http://codereview.chromium.org/271100

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

3 files changed, 2 insertions, 3 deletions

diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 6611f67..c257da2 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -213,7 +213,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestAutoContinueOnSyntaxError) {
   RunTest("testAutoContinueOnSyntaxError", kSyntaxErrorTestPage);
 }
 
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestCompletionOnPause) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestCompletionOnPause) {
   RunTest("testCompletionOnPause", kCompletionOnPause);
 }
 
diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js
index 9ea0ae7f..90cd746 100644
--- a/webkit/glue/devtools/js/debugger_agent.js
+++ b/webkit/glue/devtools/js/debugger_agent.js
@@ -1122,7 +1122,6 @@ devtools.DebuggerAgent.prototype.formatCallFrame_ = function(stackFrame) {
     scope.frameNumber = stackFrame.index;
     var scopeObjectProxy = new WebInspector.ObjectProxy(scope, [], 0, '', true);
     scopeObjectProxy.isScope = true;
-    scopeObjectProxy.properties = {};  // TODO(pfeldman): Fix autocomplete.
     switch(scope.type) {
       case ScopeType.Global:
         scopeObjectProxy.isDocument = true;
diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js
index ca8fc5e..a189529 100644
--- a/webkit/glue/devtools/js/tests.js
+++ b/webkit/glue/devtools/js/tests.js
@@ -725,7 +725,7 @@ TestSuite.prototype.testCompletionOnPause = function() {
                 ' not found among the completions: ' +
                 JSON.stringify(result));
           }
-          test.releaseControl();
+          setTimeout(callback, 0);
         });
     WebInspector.console.prompt.text = expression;
     WebInspector.console.prompt.autoCompleteSoon();