Bug 883377 - Part 6: Update browser and dom tests to follow displayName change. r=smaug
authorTooru Fujisawa <arai_a@mac.com>
Sat, 03 Dec 2016 07:44:23 +0900
changeset 325188 deb743b033b70f97af83172d90008da2a5ce7c59
parent 325187 a182612850f93496d6e1a4d753fd0e61fc1581c8
child 325189 afe43384706c6fc527164a746b7a8c8a2762d4ed
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewerssmaug
bugs883377
milestone53.0a1
Bug 883377 - Part 6: Update browser and dom tests to follow displayName change. r=smaug
browser/base/content/test/general/browser_windowopen_reflows.js
dom/bindings/test/test_promise_rejections_from_jsimplemented.html
--- a/browser/base/content/test/general/browser_windowopen_reflows.js
+++ b/browser/base/content/test/general/browser_windowopen_reflows.js
@@ -5,52 +5,52 @@
 
 const EXPECTED_REFLOWS = [
   // handleEvent flushes layout to get the tabstrip width after a resize.
   "handleEvent@chrome://browser/content/tabbrowser.xml|",
 
   // Loading a tab causes a reflow.
   "loadTabs@chrome://browser/content/tabbrowser.xml|" +
     "loadOneOrMoreURIs@chrome://browser/content/browser.js|" +
-    "gBrowserInit._delayedStartup@chrome://browser/content/browser.js|",
+    "_delayedStartup@chrome://browser/content/browser.js|",
 
   // Selecting the address bar causes a reflow.
   "select@chrome://global/content/bindings/textbox.xml|" +
     "focusAndSelectUrlBar@chrome://browser/content/browser.js|" +
-    "gBrowserInit._delayedStartup@chrome://browser/content/browser.js|",
+    "_delayedStartup@chrome://browser/content/browser.js|",
 
   // Focusing the content area causes a reflow.
-  "gBrowserInit._delayedStartup@chrome://browser/content/browser.js|",
+  "_delayedStartup@chrome://browser/content/browser.js|",
 
   // Sometimes sessionstore collects data during this test, which causes a sync reflow
   // (https://bugzilla.mozilla.org/show_bug.cgi?id=892154 will fix this)
   "ssi_getWindowDimension@resource:///modules/sessionstore/SessionStore.jsm",
 ];
 
 if (Services.appinfo.OS == "WINNT" || Services.appinfo.OS == "Darwin") {
   // TabsInTitlebar._update causes a reflow on OS X and Windows trying to do calculations
   // since layout info is already dirty. This doesn't seem to happen before
   // MozAfterPaint on Linux.
-  EXPECTED_REFLOWS.push("TabsInTitlebar._update/rect@chrome://browser/content/browser-tabsintitlebar.js|" +
-                          "TabsInTitlebar._update@chrome://browser/content/browser-tabsintitlebar.js|" +
+  EXPECTED_REFLOWS.push("rect@chrome://browser/content/browser-tabsintitlebar.js|" +
+                          "_update@chrome://browser/content/browser-tabsintitlebar.js|" +
                           "updateAppearance@chrome://browser/content/browser-tabsintitlebar.js|" +
                           "handleEvent@chrome://browser/content/tabbrowser.xml|");
 }
 
 if (Services.appinfo.OS == "Darwin") {
   // _onOverflow causes a reflow getting widths.
-  EXPECTED_REFLOWS.push("OverflowableToolbar.prototype._onOverflow@resource:///modules/CustomizableUI.jsm|" +
-                        "OverflowableToolbar.prototype.init@resource:///modules/CustomizableUI.jsm|" +
-                        "OverflowableToolbar.prototype.observe@resource:///modules/CustomizableUI.jsm|" +
-                        "gBrowserInit._delayedStartup@chrome://browser/content/browser.js|");
+  EXPECTED_REFLOWS.push("_onOverflow@resource:///modules/CustomizableUI.jsm|" +
+                        "init@resource:///modules/CustomizableUI.jsm|" +
+                        "observe@resource:///modules/CustomizableUI.jsm|" +
+                        "_delayedStartup@chrome://browser/content/browser.js|");
   // Same as above since in packaged builds there are no function names and the resource URI includes "app"
   EXPECTED_REFLOWS.push("@resource://app/modules/CustomizableUI.jsm|" +
                           "@resource://app/modules/CustomizableUI.jsm|" +
                           "@resource://app/modules/CustomizableUI.jsm|" +
-                          "gBrowserInit._delayedStartup@chrome://browser/content/browser.js|");
+                          "_delayedStartup@chrome://browser/content/browser.js|");
 }
 
 /*
  * This test ensures that there are no unexpected
  * uninterruptible reflows when opening new windows.
  */
 function test() {
   waitForExplicitFinish();
--- a/dom/bindings/test/test_promise_rejections_from_jsimplemented.html
+++ b/dom/bindings/test/test_promise_rejections_from_jsimplemented.html
@@ -88,17 +88,17 @@ doTest@${ourFile}:56:7
                         parentFrame) : "")),
       t.testPromiseWithThrowingContentThenable({
             then: function() { thereIsNoSuchContentFunction3(); }
         }).then(
           ensurePromiseFail.bind(null, 6),
           checkExn.bind(null, 90, "ReferenceError",
                         "thereIsNoSuchContentFunction3 is not defined",
                         undefined, ourFile, 6,
-                        `doTest/<.then@${ourFile}:90:32
+                        `then@${ourFile}:90:32
 ` + (asyncStack ? `Async*doTest@${ourFile}:89:7\n` + parentFrame : ""))),
       t.testPromiseWithDOMExceptionThrowingPromiseInit().then(
           ensurePromiseFail.bind(null, 7),
           checkExn.bind(null, 98, "NotFoundError",
                         "We are a second DOMException",
                         DOMException.NOT_FOUND_ERR, ourFile, 7,
                         `doTest@${ourFile}:98:7
 ` +