Merge mozilla-central to mozilla-inbound

browser/base/content/test/browser_popupNotification.js

@@ -261,7 +261,6 @@ var tests = [
 
       // switch back to the old browser
       gBrowser.selectedTab = this.oldSelectedTab;
-
     },
     onHidden: function (popup) {
       // actually remove the notification to prevent it from reappearing
@@ -601,14 +600,10 @@ var tests = [
   // Test notification when chrome is hidden
   { // Test #19
     run: function () {
-      this.oldSelectedTab = gBrowser.selectedTab;
-      gBrowser.selectedTab = gBrowser.addTab("about:blank");
-
-      let self = this;
-      loadURI("about:addons", function() {
-        self.notifyObj = new basicNotification();
-        self.notification = showNotification(self.notifyObj);
-      });
+      window.locationbar.visible = false;
+      this.notifyObj = new basicNotification();
+      this.notification = showNotification(this.notifyObj);
+      window.locationbar.visible = true;
     },
     onShown: function (popup) {
       checkPopup(popup, this.notifyObj);
@@ -619,9 +614,6 @@ var tests = [
       ok(this.notifyObj.dismissalCallbackTriggered, "dismissal callback triggered");
       this.notification.remove();
       ok(this.notifyObj.removedCallbackTriggered, "removed callback triggered");
-
-      gBrowser.removeTab(gBrowser.selectedTab);
-      gBrowser.selectedTab = this.oldSelectedTab;
     }
   },
   // Test notification is removed when dismissed if removeOnDismissal is true

dom/base/nsDOMWindowUtils.cpp

@@ -308,9 +308,8 @@ MaybeReflowForInflationScreenWidthChange(nsPresContext *aPresContext)
             nsCOMPtr<nsIPresShell> shell;
             nsCOMPtr<nsIContentViewer> cv = do_QueryInterface(array[i]);
             cv->GetPresShell(getter_AddRefs(shell));
-            nsFrameManager *fm = shell->FrameManager();
-            if (fm) {
-              nsIFrame *rootFrame = fm->GetRootFrame();
+            if (shell) {
+              nsIFrame *rootFrame = shell->GetRootFrame();
               if (rootFrame) {
                 shell->FrameNeedsReflow(rootFrame, nsIPresShell::eResize,
                                         NS_FRAME_IS_DIRTY);

mobile/android/base/locales/Makefile.in

@@ -41,7 +41,7 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir = mobile/android/base/locales
 
-include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
 
 # special case some locale codes, he and id
 # http://code.google.com/p/android/issues/detail?id=3639

testing/marionette/client/marionette/runtests.py

@@ -265,10 +265,7 @@ class MarionetteTestRunner(object):
         if not self.marionette:
             self.start_marionette()
 
-        if not os.path.isabs(test):
-            filepath = os.path.join(os.path.dirname(__file__), test)
-        else:
-            filepath = test
+        filepath = os.path.abspath(test)
 
         if os.path.isdir(filepath):
             for root, dirs, files in os.walk(filepath):