Issue %3005 - Centralize the Permissions Manager backend

- extensions/(cookie|permissions) -> components/permissions
- components/cookie -> components/permissions
- Related XPIDLs from netwerk -> components/permissions

2 files changed, 2 insertions, 3 deletions

diff --git a/layout/build/moz.build b/layout/build/moz.build
index cb606d2a6..e0f7750e7 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -28,6 +28,7 @@ LOCAL_INCLUDES += [
     '../view',
     '../xul',
     '/caps',
+    '/components/permissions/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
@@ -52,7 +53,6 @@ LOCAL_INCLUDES += [
     '/editor/composer',
     '/editor/txmgr',
     '/editor/txtsvc',
-    '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base',
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index e9095ce03..ab48ceca9 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -273,9 +273,8 @@ nsLayoutStatics::Initialize()
 
   ProcessPriorityManager::Init();
 
-#ifdef MOZ_PERMISSIONS
   nsPermissionManager::ClearOriginDataObserverInit();
-#endif
+
   nsCookieService::AppClearDataObserverInit();
   nsApplicationCacheService::AppClearDataObserverInit();