From 52dd7966373317ca3b08e7467fe1b536b7187452 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Tue, 21 Jun 2016 22:23:58 +0200
Subject: [PATCH] Bug 1278574 - [2.2] Instantiate MediaPrefs on Android during
 AndroidBridge construction. r=jya

---
 layout/build/nsLayoutStatics.cpp | 5 +++++
 widget/android/AndroidBridge.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index d7b3045f2627b..166223bcf0313 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -322,6 +322,11 @@ nsLayoutStatics::Initialize()
   Servo_Initialize();
 #endif
 
+#ifndef MOZ_WIDGET_ANDROID
+  // On Android, we instantiate it when constructing AndroidBridge.
+  MediaPrefs::GetSingleton();
+#endif
+
   return NS_OK;
 }
 
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index f3a1b441471a8..7e959158e3e58 100644
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -52,6 +52,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/ContentChild.h"
 #include "nsIObserverService.h"
+#include "MediaPrefs.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;
@@ -169,6 +170,7 @@ AndroidBridge::ConstructBridge()
     MOZ_ASSERT(!sBridge);
     sBridge = new AndroidBridge();
 
+    MediaPrefs::GetSingleton();
 }
 
 void