Backed out changeset 804b3282f778 (bug 1407026) for failing devtools/client/webconsole/test/browser_console.js on Windows 7 debug without e10s. r=backout

--HG--
extra : amend_source : 969438fbe7623611a02be5d05fa776269bbd7adc

devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js

@@ -197,8 +197,4 @@ function* testCPOWInspection(hud) {
   // Just a sanity check to make sure a valid packet came back
   is(prototypeAndProperties.prototype.class, "XBL prototype JSClass",
     "Looks like a valid response");
-
-  // The CPOW is in the _contentWindow property.
-  let cpow = prototypeAndProperties.ownProperties._contentWindow.value;
-  is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
 }

devtools/client/webconsole/test/browser_console.js

@@ -197,8 +197,4 @@ function* testCPOWInspection(hud) {
   // Just a sanity check to make sure a valid packet came back
   is(prototypeAndProperties.prototype.class, "XBL prototype JSClass",
     "Looks like a valid response");
-
-  // The CPOW is in the _contentWindow property.
-  let cpow = prototypeAndProperties.ownProperties._contentWindow.value;
-  is(cpow.class, "CPOW: Window", "The CPOW grip has the right class.");
 }

devtools/server/actors/object.js

@@ -83,7 +83,7 @@ ObjectActor.prototype = {
     let unwrapped = DevToolsUtils.unwrap(this.obj);
     if (!unwrapped) {
       if (DevToolsUtils.isCPOW(this.obj)) {
-        g.class = "CPOW: " + this.obj.class;
+        g.class = "CPOW: " + g.class;
       } else {
         g.class = "Inaccessible";
       }