Bug 1312436 - Enable browser_tab_dragdrop.js on e10s in debug mode. r=felipe draft
authorJared Wein <jwein@mozilla.com>
Mon, 24 Oct 2016 10:46:27 -0400
changeset 428678 a7afecdb6b96b35ef766f36f0cca2de195ee4fd0
parent 428045 75c306c21c0f719b590d4ebd63e1ca7ad8981adc
child 534814 c5b44c7fcd827daaffbbc33d763997f2751d719e
push id33396
push userjwein@mozilla.com
push dateMon, 24 Oct 2016 14:47:18 +0000
reviewersfelipe
bugs1312436
milestone52.0a1
Bug 1312436 - Enable browser_tab_dragdrop.js on e10s in debug mode. r=felipe MozReview-Commit-ID: 8oqY8EysxfO
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_tab_dragdrop.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -418,17 +418,17 @@ run-if = e10s
 [browser_tabDrop.js]
 skip-if = buildapp == 'mulet'
 [browser_tabReorder.js]
 skip-if = buildapp == 'mulet'
 [browser_tab_detach_restore.js]
 [browser_tab_drag_drop_perwindow.js]
 skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop.js]
-skip-if = buildapp == 'mulet' || (e10s && debug) # Bug 1150036: In e10s, content process crashes, main process leaks!
+skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop2.js]
 skip-if = buildapp == 'mulet'
 [browser_tabbar_big_widgets.js]
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
 [browser_tabfocus.js]
 [browser_tabkeynavigation.js]
 skip-if = (os == "mac" && !e10s) # Bug 1237713 - OSX eats keypresses for some reason
--- a/browser/base/content/test/general/browser_tab_dragdrop.js
+++ b/browser/base/content/test/general/browser_tab_dragdrop.js
@@ -32,19 +32,17 @@ function loadURI(tab, url) {
   return BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 }
 
 // Creates a framescript which caches the current object value from the plugin
 // in the page. checkObjectValue below verifies that the framescript is still
 // active for the browser and that the cached value matches that from the plugin
 // in the page which tells us the plugin hasn't been reinitialized.
 function* cacheObjectValue(browser) {
-  info("11111111")
   yield ContentTask.spawn(browser, null, function*() {
-    info("ct--------------11111111")
     let plugin = content.document.wrappedJSObject.body.firstChild;
     info(`plugin is ${plugin}`);
     let win = content.document.defaultView;
     info(`win is ${win}`);
     win.objectValue = plugin.getObjectValue();
     info(`got objectValue: ${win.objectValue}`);
     win.checkObjectValueListener = () => {
       let result;