diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 00754e5e966..85bf45de6ff 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "9caa3c130cdfe2597d396d7fc4e70a2463d492ed", 
+    "revision": "340f6676fc5dc34f1b9ab0c40169c0c4fd744587", 
     "repo_path": "/integration/gaia-central"
 }
diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp
index ac096eac95d..bb75c32aea2 100644
--- a/dom/camera/DOMCameraManager.cpp
+++ b/dom/camera/DOMCameraManager.cpp
@@ -80,7 +80,6 @@ nsDOMCameraManager::CheckPermission(nsPIDOMWindow* aWindow)
   uint32_t permission = nsIPermissionManager::DENY_ACTION;
   permMgr->TestPermissionFromWindow(aWindow, "camera", &permission);
   if (permission != nsIPermissionManager::ALLOW_ACTION) {
-    NS_WARNING("No permission to access camera");
     return false;
   }
 
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 5757b50f2af..f58cec3261c 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2451,23 +2451,6 @@ ContentParent::RecvCloseAlert(const nsString& aName)
     return true;
 }
 
-bool
-ContentParent::RecvTestPermissionFromPrincipal(const IPC::Principal& aPrincipal,
-                                               const nsCString& aType,
-                                               uint32_t* permission)
-{
-    nsCOMPtr<nsIPermissionManager> permissionManager =
-        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-    NS_ENSURE_TRUE(permissionManager, false);
-
-    nsresult rv = permissionManager->TestPermissionFromPrincipal(aPrincipal,
-                                                                 aType.get(),
-                                                                 permission);
-    NS_ENSURE_SUCCESS(rv, false);
-
-    return true;
-}
-
 bool
 ContentParent::RecvSyncMessage(const nsString& aMsg,
                                const ClonedMessageData& aData,
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 92a0139693f..340300d9961 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -371,10 +371,6 @@ private:
 
     virtual bool RecvCloseAlert(const nsString& aName);
 
-    virtual bool RecvTestPermissionFromPrincipal(const IPC::Principal& aPrincipal,
-                                                 const nsCString& aType,
-                                                 uint32_t* permission);
-
     virtual bool RecvLoadURIExternal(const URIParams& uri);
 
     virtual bool RecvSyncMessage(const nsString& aMsg,
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 6acb5278e6d..969e912c659 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -344,22 +344,6 @@ parent:
 
     CloseAlert(nsString name);
 
-    /**
-     * Tests permission for a provided principal using the permission
-     * manager.
-     *
-     * @param principal
-     *   The principal to test for the permissions.
-     * @param type
-     *   The type of permission to for the principal.
-     *
-     * NOTE: The principal is untrusted in the parent process. Only
-     *       principals that can live in the content process should
-     *       be provided.
-     */
-    sync TestPermissionFromPrincipal(Principal principal, nsCString type)
-        returns (uint32_t permission);
-
     PExternalHelperApp(OptionalURIParams uri, nsCString aMimeContentType,
                        nsCString aContentDisposition, bool aForceSave,
                        int64_t aContentLength, OptionalURIParams aReferrer);
diff --git a/dom/src/notification/Notification.cpp b/dom/src/notification/Notification.cpp
index a03f209c074..836132a2424 100644
--- a/dom/src/notification/Notification.cpp
+++ b/dom/src/notification/Notification.cpp
@@ -3,9 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PCOMContentPermissionRequestChild.h"
-#include "mozilla/dom/PBrowserChild.h"
 #include "mozilla/dom/Notification.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/Preferences.h"
 #include "TabChild.h"
 #include "nsContentUtils.h"
@@ -433,20 +431,12 @@ Notification::GetPermissionInternal(nsISupports* aGlobal, ErrorResult& aRv)
 
   uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
 
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    ContentChild* cpc = ContentChild::GetSingleton();
+  nsCOMPtr<nsIPermissionManager> permissionManager =
+    do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
 
-    cpc->SendTestPermissionFromPrincipal(IPC::Principal(principal),
-                                         NS_LITERAL_CSTRING("desktop-notification"),
-                                         &permission);
-  } else {
-    nsCOMPtr<nsIPermissionManager> permissionManager =
-      do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-
-    permissionManager->TestPermissionFromPrincipal(principal,
-                                                   "desktop-notification",
-                                                   &permission);
-  }
+  permissionManager->TestPermissionFromPrincipal(principal,
+                                                 "desktop-notification",
+                                                 &permission);
 
   // Convert the result to one of the enum types.
   switch (permission) {