Bug 1072498 - Collapse the dom.browser_frames.useAsyncPanZoom pref into layers.async-pan-zoom.enabled. r=fabrice

b2g/app/b2g.js

@@ -433,7 +433,6 @@ pref("dom.mozBrowserFramesEnabled", true);
 pref("dom.ipc.processCount", 100000);
 
 pref("dom.ipc.browser_frames.oop_by_default", false);
-pref("dom.browser_frames.useAsyncPanZoom", true);
 
 // SMS/MMS
 pref("dom.sms.enabled", true);

b2g/chrome/content/settings.js

@@ -510,10 +510,6 @@ let settingsToObserve = {
     defaultValue: 0
   },
   'app.update.interval': 86400,
-  'apz.force-enable': {
-    prefName: 'dom.browser_frames.useAsyncPanZoom',
-    defaultValue: false
-  },
   'apz.overscroll.enabled': true,
   'debug.fps.enabled': {
     prefName: 'layers.acceleration.draw-fps',

dom/base/nsFrameLoader.cpp

@@ -2103,7 +2103,7 @@ nsFrameLoader::TryRemoteBrowser()
   nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
   ScrollingBehavior scrollingBehavior = DEFAULT_SCROLLING;
 
-  if (Preferences::GetBool("dom.browser_frames.useAsyncPanZoom", false) ||
+  if (Preferences::GetBool("layers.async-pan-zoom.enabled", false) ||
       mOwnerContent->AttrValueIs(kNameSpaceID_None,
                                  nsGkAtoms::mozasyncpanzoom,
                                  nsGkAtoms::_true,