Bug 1547397 - Part 3: Move the permission manager code to extensions/permissions; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D29116

--HG--
rename : extensions/cookie/nsPermission.cpp => extensions/permissions/nsPermission.cpp
rename : extensions/cookie/nsPermission.h => extensions/permissions/nsPermission.h
rename : extensions/cookie/nsPermissionManager.cpp => extensions/permissions/nsPermissionManager.cpp
rename : extensions/cookie/nsPermissionManager.h => extensions/permissions/nsPermissionManager.h
rename : extensions/cookie/test/.eslintrc.js => extensions/permissions/test/.eslintrc.js
rename : extensions/cookie/test/browser.ini => extensions/permissions/test/browser.ini
rename : extensions/cookie/test/browser_permmgr_sync.js => extensions/permissions/test/browser_permmgr_sync.js
rename : extensions/cookie/test/browser_permmgr_viewsrc.js => extensions/permissions/test/browser_permmgr_viewsrc.js
rename : extensions/cookie/test/gtest/PermissionManagerTest.cpp => extensions/permissions/test/gtest/PermissionManagerTest.cpp
rename : extensions/cookie/test/gtest/moz.build => extensions/permissions/test/gtest/moz.build
rename : extensions/cookie/test/moz.build => extensions/permissions/test/moz.build
rename : extensions/cookie/test/unit/test_permmanager_cleardata.js => extensions/permissions/test/unit/test_permmanager_cleardata.js
rename : extensions/cookie/test/unit/test_permmanager_default_pref.js => extensions/permissions/test/unit/test_permmanager_default_pref.js
rename : extensions/cookie/test/unit/test_permmanager_defaults.js => extensions/permissions/test/unit/test_permmanager_defaults.js
rename : extensions/cookie/test/unit/test_permmanager_expiration.js => extensions/permissions/test/unit/test_permmanager_expiration.js
rename : extensions/cookie/test/unit/test_permmanager_getAllForURI.js => extensions/permissions/test/unit/test_permmanager_getAllForURI.js
rename : extensions/cookie/test/unit/test_permmanager_getAllWithTypePrefix.js => extensions/permissions/test/unit/test_permmanager_getAllWithTypePrefix.js
rename : extensions/cookie/test/unit/test_permmanager_getPermissionObject.js => extensions/permissions/test/unit/test_permmanager_getPermissionObject.js
rename : extensions/cookie/test/unit/test_permmanager_idn.js => extensions/permissions/test/unit/test_permmanager_idn.js
rename : extensions/cookie/test/unit/test_permmanager_load_invalid_entries.js => extensions/permissions/test/unit/test_permmanager_load_invalid_entries.js
rename : extensions/cookie/test/unit/test_permmanager_local_files.js => extensions/permissions/test/unit/test_permmanager_local_files.js
rename : extensions/cookie/test/unit/test_permmanager_matches.js => extensions/permissions/test/unit/test_permmanager_matches.js
rename : extensions/cookie/test/unit/test_permmanager_matchesuri.js => extensions/permissions/test/unit/test_permmanager_matchesuri.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_4-7.js => extensions/permissions/test/unit/test_permmanager_migrate_4-7.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_4-7_no_history.js => extensions/permissions/test/unit/test_permmanager_migrate_4-7_no_history.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_5-7a.js => extensions/permissions/test/unit/test_permmanager_migrate_5-7a.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_5-7b.js => extensions/permissions/test/unit/test_permmanager_migrate_5-7b.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_6-7a.js => extensions/permissions/test/unit/test_permmanager_migrate_6-7a.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_6-7b.js => extensions/permissions/test/unit/test_permmanager_migrate_6-7b.js
rename : extensions/cookie/test/unit/test_permmanager_migrate_7-8.js => extensions/permissions/test/unit/test_permmanager_migrate_7-8.js
rename : extensions/cookie/test/unit/test_permmanager_notifications.js => extensions/permissions/test/unit/test_permmanager_notifications.js
rename : extensions/cookie/test/unit/test_permmanager_removeall.js => extensions/permissions/test/unit/test_permmanager_removeall.js
rename : extensions/cookie/test/unit/test_permmanager_removebytype.js => extensions/permissions/test/unit/test_permmanager_removebytype.js
rename : extensions/cookie/test/unit/test_permmanager_removebytypesince.js => extensions/permissions/test/unit/test_permmanager_removebytypesince.js
rename : extensions/cookie/test/unit/test_permmanager_removeforapp.js => extensions/permissions/test/unit/test_permmanager_removeforapp.js
rename : extensions/cookie/test/unit/test_permmanager_removepermission.js => extensions/permissions/test/unit/test_permmanager_removepermission.js
rename : extensions/cookie/test/unit/test_permmanager_removesince.js => extensions/permissions/test/unit/test_permmanager_removesince.js
rename : extensions/cookie/test/unit/test_permmanager_subdomains.js => extensions/permissions/test/unit/test_permmanager_subdomains.js
rename : extensions/cookie/test/unit/xpcshell.ini => extensions/permissions/test/unit/xpcshell.ini
extra : moz-landing-system : lando

.eslintignore

@@ -14,7 +14,7 @@ obj*/**
 # We ignore all these directories by default, until we get them enabled.
 # If you are enabling a directory, please add directory specific exclusions
 # below.
-extensions/cookie/**
+extensions/permissions/**
 extensions/spellcheck/**
 extensions/universalchardet/**
 image/**

dom/ipc/moz.build

@@ -161,7 +161,7 @@ LOCAL_INCLUDES += [
     '/dom/media/webspeech/synth/ipc',
     '/dom/security',
     '/dom/storage',
-    '/extensions/cookie',
+    '/extensions/permissions',
     '/extensions/spellcheck/src',
     '/gfx/2d',
     '/hal/sandbox',

dom/permission/moz.build

@@ -20,7 +20,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/extensions/cookie',
+    '/extensions/permissions',
 ]
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']

extensions/cookie/components.conf

@@ -1,16 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Classes = [
-    {
-        'cid': '{4f6b5e00-0c36-11d5-a535-0010a401eb10}',
-        'contract_ids': ['@mozilla.org/permissionmanager;1'],
-        'singleton': True,
-        'type': 'nsIPermissionManager',
-        'constructor': 'nsPermissionManager::GetXPCOMSingleton',
-        'headers': ['/extensions/cookie/nsPermissionManager.h'],
-    },
-]

extensions/cookie/moz.build

@@ -1,30 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-TEST_DIRS += ['test']
-
-UNIFIED_SOURCES += [
-    'nsPermission.cpp',
-    'nsPermissionManager.cpp',
-]
-
-XPCOM_MANIFESTS += [
-    'components.conf',
-]
-
-LOCAL_INCLUDES += [
-    '/caps',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-    CXXFLAGS += ['-Wno-error=shadow']
-
-with Files('**'):
-    BUG_COMPONENT = ('Core', 'Networking: Cookies')

extensions/permissions/components.conf

@@ -13,4 +13,12 @@ Classes = [
         'init_method': 'Init',
         'categories': {'content-policy': '@mozilla.org/permissions/contentblocker;1'},
     },
+    {
+        'cid': '{4f6b5e00-0c36-11d5-a535-0010a401eb10}',
+        'contract_ids': ['@mozilla.org/permissionmanager;1'],
+        'singleton': True,
+        'type': 'nsIPermissionManager',
+        'constructor': 'nsPermissionManager::GetXPCOMSingleton',
+        'headers': ['/extensions/permissions/nsPermissionManager.h'],
+    },
 ]

extensions/permissions/moz.build

@@ -4,15 +4,28 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+TEST_DIRS += ['test']
+
 UNIFIED_SOURCES += [
     'nsContentBlocker.cpp',
+    'nsPermission.cpp',
+    'nsPermissionManager.cpp',
 ]
 
 XPCOM_MANIFESTS += [
     'components.conf',
 ]
 
+LOCAL_INCLUDES += [
+    '/caps',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+    CXXFLAGS += ['-Wno-error=shadow']
+
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+    BUG_COMPONENT = ('Core', 'Permission Manager')

extensions/permissions/test/gtest/moz.build

@@ -9,7 +9,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/extensions/cookie',
+    '/extensions/permissions',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'

layout/build/moz.build

@@ -49,7 +49,7 @@ LOCAL_INCLUDES += [
     '/dom/xslt/xslt',
     '/dom/xul',
     '/editor/composer',
-    '/extensions/cookie',
+    '/extensions/permissions',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base',

netwerk/cookie/moz.build

@@ -43,7 +43,7 @@ if CONFIG['NECKO_COOKIES']:
     ]
     LOCAL_INCLUDES += [
         '/dom/base',
-        '/extensions/cookie',
+        '/extensions/permissions',
         '/intl/uconv',
     ]
 

toolkit/components/antitracking/moz.build

@@ -18,7 +18,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/extensions/cookie',
+    '/extensions/permissions',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

toolkit/toolkit.mozbuild

@@ -87,7 +87,6 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     ]
 
 DIRS += [
-    '/extensions/cookie',
     '/extensions/permissions',
 ]