DevTools: Restore devtools sanity console tests.

BUG=18786

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

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

2 files changed, 7 insertions, 11 deletions

diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index dcc3fd6..4d08640 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -143,19 +143,16 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMainResource) {
 }
 
 // Tests resources panel enabling.
-// http://crbug.com/16767
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
   RunTest("testEnableResourcesTab", kSimplePage);
 }
 
 // Tests resource headers.
-// http://crbug.com/16767
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestResourceHeaders) {
   RunTest("testResourceHeaders", kDebuggerTestPage);
 }
 
 // Tests profiler panel.
-// http://crbug.com/16767
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) {
   RunTest("testProfilerTab", kJsPage);
 }
@@ -178,14 +175,12 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseInEval) {
 }
 
 // Tests console eval.
-// DISABLED:  See http://crbug.com/18786
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleEval) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleEval) {
   RunTest("testConsoleEval", kConsoleTestPage);
 }
 
 // Tests console log.
-// DISABLED:  See http://crbug.com/18786
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleLog) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) {
   RunTest("testConsoleLog", kConsoleTestPage);
 }
 
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index db94bbd..830895e 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -610,6 +610,8 @@ WebInspector.ScriptsPanel.prototype.doEvalInCallFrame =
 })();
 
 
+(function() {
+var oldFormatObject = WebInspector.ConsoleView.prototype._formatobject;
 WebInspector.ConsoleView.prototype._formatobject = function(object, elem) {
   var section;
   if (object.handle && object.className) {
@@ -622,13 +624,12 @@ WebInspector.ConsoleView.prototype._formatobject = function(object, elem) {
         _expandedProperties : { className : '' }
       }
     };
+    elem.appendChild(section.element);
   } else {
-    section = new WebInspector.ObjectPropertiesSection(
-        new WebInspector.ObjectProxy(object.___devtools_id),
-        object.___devtools_class_name);
+    return oldFormatObject.apply(this, arguments);
   }
-  elem.appendChild(section.element);
 };
+})();
 
 
 /** Pending WebKit upstream by apavlov). Fixes iframe vs drag problem. */