Backout 4e54a6eb43d2 (bug 780686) and f10e4ac36ed2 (bug 772299) due t…

…o mochitest-other permaorange on a CLOSED TREE.
Brli · Aug 8, 2012 · 88f630d · 88f630d
1 parent 8aaf798
commit 88f630d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
@@ -274,7 +274,7 @@ let DOMApplicationRegistry = {
     let clone = {
       installOrigin: aApp.installOrigin,
       origin: aApp.origin,
-      receipts: aApp.receipts ? JSON.parse(JSON.stringify(aApp.receipts)) : null,
+      receipts: aApp.receipts,
       installTime: aApp.installTime,
       manifestURL: aApp.manifestURL,
       progress: aApp.progress || 0.0,

diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
@@ -447,13 +447,9 @@
 
       <method name="addProgressListener">
         <parameter name="aListener"/>
-        <parameter name="aNotifyMask"/>
         <body>
           <![CDATA[
-            if (!aNotifyMask) {
-              aNotifyMask = Components.interfaces.nsIWebProgress.NOTIFY_ALL;
-            }
-            this.webProgress.addProgressListener(aListener, aNotifyMask);
+            this.webProgress.addProgressListener(aListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
           ]]>
         </body>
       </method>

diff --git a/webapprt/content/webapp.js b/webapprt/content/webapp.js
@@ -61,8 +61,8 @@ function onLoad() {
     // available beforehand.
     Services.obs.addObserver(function observeOnce(subj, topic, data) {
       Services.obs.removeObserver(observeOnce, "webapprt-test-did-install");
-      gAppBrowser.addProgressListener(progressListener,
-                                      Ci.nsIWebProgress.NOTIFY_LOCATION);
+      gAppBrowser.webProgress.
+        addProgressListener(progressListener,Ci.nsIWebProgress.NOTIFY_LOCATION);
     }, "webapprt-test-did-install", false);
 
     // This observer is present for the lifetime of the runtime.

diff --git a/webapprt/test/chrome/browser_window-title.js b/webapprt/test/chrome/browser_window-title.js
@@ -36,8 +36,8 @@ function test() {
       }
     };
 
-    appBrowser.addProgressListener(progressListener,
-                                   Ci.nsIWebProgress.NOTIFY_LOCATION);
+    appBrowser.webProgress.
+      addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_LOCATION);
 
     function testNext() {
       if (!tests.length) {