--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@@ -279,20 +279,16 @@ res\fonts\mathfontCMSY10.properties
 res\fonts\mathfontMath1.properties
 res\fonts\mathfontMath2.properties
 res\fonts\mathfontMath4.properties
 res\fonts\mathfontMTExtra.properties
 res\fonts\mathfontPUA.properties
 res\fonts\mathfontSymbol.properties
 
 
-; p3p
-components\p3p.dll
-components\p3p.xpt
-
 ; XPInstall
 res\cmessage.txt
 
 ; storage
 components\storage.xpt
 components\strgcmps.dll
 
 ; Effective TLD

--- a/embedding/config/basebrowser-mac-macho
+++ b/embedding/config/basebrowser-mac-macho
@@ -260,18 +260,14 @@ res/fonts/mathfontCMSY10.properties
 res/fonts/mathfontMath1.properties
 res/fonts/mathfontMath2.properties
 res/fonts/mathfontMath4.properties
 res/fonts/mathfontMTExtra.properties
 res/fonts/mathfontPUA.properties
 res/fonts/mathfontSymbol.properties
 components/libucvmath.dylib
 
-; p3p
-components/libp3p.dylib
-components/p3p.xpt
-
 ; svg
 components/dom_svg.xpt
 res/svg.css
 
 ; Effective TLD
 res/effective_tld_names.dat

--- a/embedding/config/basebrowser-qnx
+++ b/embedding/config/basebrowser-qnx
@@ -262,15 +262,11 @@ res/entityTables/transliterate.propertie
 ;res/fonts/mathfontMath1.properties
 ;res/fonts/mathfontMath2.properties
 ;res/fonts/mathfontMath4.properties
 ;res/fonts/mathfontMTExtra.properties
 ;res/fonts/mathfontPUA.properties
 ;res/fonts/mathfontSymbol.properties
 ;components/libucvmath.so
 
-; p3p
-components/libp3p.so
-components/p3p.xpt
-
 ; Effective TLD
 res/effective_tld_names.dat
 

--- a/embedding/config/basebrowser-unix
+++ b/embedding/config/basebrowser-unix
@@ -265,15 +265,11 @@ res/entityTables/transliterate.propertie
 ;res/fonts/mathfontMath1.properties
 ;res/fonts/mathfontMath2.properties
 ;res/fonts/mathfontMath4.properties
 ;res/fonts/mathfontMTExtra.properties
 ;res/fonts/mathfontPUA.properties
 ;res/fonts/mathfontSymbol.properties
 ;components/libucvmath.so
 
-; p3p
-components/libp3p.so
-components/p3p.xpt
-
 ; Effective TLD
 res/effective_tld_names.dat
 

--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@@ -295,14 +295,10 @@ res\html\gopher-unknown.gif
 ; res\fonts\mathfontMath1.properties
 ; res\fonts\mathfontMath2.properties
 ; res\fonts\mathfontMath4.properties
 ; res\fonts\mathfontMTExtra.properties
 ; res\fonts\mathfontPUA.properties
 ; res\fonts\mathfontSymbol.properties
 
 
-; p3p
-components\p3p.dll
-components\p3p.xpt
-
 ; Effective TLD
 res\effective_tld_names.dat

--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -751,36 +751,31 @@ pref("network.proxy.ssl",               
 pref("network.proxy.ssl_port",              0);
 pref("network.proxy.socks",                 "");
 pref("network.proxy.socks_port",            0);
 pref("network.proxy.socks_version",         5);
 pref("network.proxy.socks_remote_dns",      false);
 pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
 pref("network.proxy.failover_timeout",      1800); // 30 minutes
 pref("network.online",                      true); //online/offline
-pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-p3p
+pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
 pref("network.cookie.disableCookieForMailNews", true); // disable all cookies for mail
 pref("network.cookie.lifetimePolicy",       0); // accept normally, 1-askBeforeAccepting, 2-acceptForSession,3-acceptForNDays
 pref("network.cookie.alwaysAcceptSessionCookies", false);
 pref("network.cookie.prefsMigrated",        false);
 pref("network.cookie.lifetime.days",        90);
 
 // The PAC file to load.  Ignored unless network.proxy.type is 2.
 pref("network.proxy.autoconfig_url", "");
 
 // If we cannot load the PAC file, then try again (doubling from interval_min
 // until we reach interval_max or the PAC file is successfully loaded).
 pref("network.proxy.autoconfig_retry_interval_min", 5);    // 5 seconds
 pref("network.proxy.autoconfig_retry_interval_max", 300);  // 5 minutes
 
-// The following default value is for p3p medium mode.
-// See xpfe/components/permissions/content/cookieP3P.xul for the definitions of low/medium/hi
-pref("network.cookie.p3p",                  "ffffaaaa");
-pref("network.cookie.p3plevel",             1); // 0=low, 1=medium, 2=high, 3=custom
-
 pref("converter.html2txt.structs",          true); // Output structured phrases (strong, em, code, sub, sup, b, i, u)
 pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
 
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.collationOption",                "chrome://navigator-platform/locale/navigator.properties");
 pref("intl.menuitems.alwaysappendaccesskeys","chrome://navigator/locale/navigator.properties");
 pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://navigator/locale/navigator.properties");

--- a/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst
+++ b/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst
@@ -498,17 +498,16 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/");
 
     /* Log files that are created after the installer is done, so they can be uninstalled */
     logComment("Installing: "    + fProgram + ".autoreg");
     logComment("Installing: "    + fProgram + "Xpcs Registry.dat");
     logComment("Installing: "    + fProgram + "xpcom.log");
     logComment("Create Folder: " + fProgram + "components");
     logComment("Installing: "    + fProgram + "components\\xpti.dat");
     logComment("Installing: "    + fProgram + "components\\xptitemp.dat");

--- a/xpinstall/packager/mac/browser.jst
+++ b/xpinstall/packager/mac/browser.jst
@@ -98,17 +98,16 @@ if (verifyDiskSpace(fProgram, srDest))
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "content/pippki/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "content/pipnss/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/");
 
     // make an alias to the browser on the desktop 
     var desktopFolder = getFolder("Mac Desktop");
     var ignoreErr = fileMacAlias(fProgram,      "Mozilla",   // source
                              desktopFolder, "Mozilla");  // target
     logComment("fileMacAlias() returned: " + ignoreErr);
 
     if (err==SUCCESS)

--- a/xpinstall/packager/mac/langenus.jst
+++ b/xpinstall/packager/mac/langenus.jst
@@ -63,17 +63,16 @@ if (verifyDiskSpace(fProgram, srDest))
         registerChrome(chromeType, cf, localeName + "necko/");
         registerChrome(chromeType, cf, localeName + "mozldap/");
         registerChrome(chromeType, cf, localeName + "autoconfig/");
         registerChrome(chromeType, cf, localeName + "cookie/");
         registerChrome(chromeType, cf, localeName + "wallet/");
         registerChrome(chromeType, cf, localeName + "help/");
         registerChrome(chromeType, cf, localeName + "pippki/");
         registerChrome(chromeType, cf, localeName + "pipnss/");
-        registerChrome(chromeType, cf, localeName + "p3p/");
 
         registerChrome(chromeType, cf, localeName + "global-region/");
         registerChrome(chromeType, cf, localeName + "communicator-region/");
         registerChrome(chromeType, cf, localeName + "editor-region/");
         registerChrome(chromeType, cf, localeName + "messenger-region/");
         registerChrome(chromeType, cf, localeName + "navigator-region/");
 
         registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");

--- a/xpinstall/packager/os2/browser.jst
+++ b/xpinstall/packager/os2/browser.jst
@@ -216,17 +216,16 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/");
 
     /* Log files that are created after the installer is done, so they can be uninstalled */
     logComment("Installing: "    + fProgram + ".autoreg");
     logComment("Installing: "    + fProgram + "Xpcs Registry.dat");
     logComment("Installing: "    + fProgram + "xpcom.log");
     logComment("Create Folder: " + fProgram + "components");
     logComment("Installing: "    + fProgram + "components\\xpti.dat");
     logComment("Installing: "    + fProgram + "components\\xptitemp.dat");

--- a/xpinstall/packager/os2/langenus.jst
+++ b/xpinstall/packager/os2/langenus.jst
@@ -66,17 +66,16 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "necko/");
     registerChrome(chromeType, cf, localeName + "mozldap/");
     registerChrome(chromeType, cf, localeName + "autoconfig/");
     registerChrome(chromeType, cf, localeName + "cookie/");
     registerChrome(chromeType, cf, localeName + "wallet/");
     registerChrome(chromeType, cf, localeName + "help/");
     registerChrome(chromeType, cf, localeName + "pippki/");
     registerChrome(chromeType, cf, localeName + "pipnss/");
-    registerChrome(chromeType, cf, localeName + "p3p/");
 
     registerChrome(chromeType, cf, localeName + "global-region/");
     registerChrome(chromeType, cf, localeName + "communicator-region/");
     registerChrome(chromeType, cf, localeName + "editor-region/");
     registerChrome(chromeType, cf, localeName + "messenger-region/");
     registerChrome(chromeType, cf, localeName + "navigator-region/");
 
     registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");

--- a/xpinstall/packager/packages-os2
+++ b/xpinstall/packager/packages-os2
@@ -318,20 +318,16 @@ bin/components/spellchecker.xpt
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
 ;bin/nsldap32v60.dll
 bin/ldap60.dll
 ;bin/nsldappr32v60.dll
 bin/prldap60.dll
 bin/ldif60.dll
 
-; p3p
-bin/components/p3p.xpt
-bin/components/p3p.dll
-
 ; classic theme
 bin/chrome/classic.jar
 bin/chrome/classic.manifest
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 bin/chrome/classic/*
 
@@ -532,17 +528,15 @@ bin/components/sroaming.dll
 bin/chrome/sroaming.jar
 
 ;Things that aren't packaged and why (or not why)
 ;accproxy.dll - I don't know
 ;accessproxy.xpt - I don't know
 ;iiextras.dll - I don't know
 ;iiextras.xpt - I don't know
 ;MyServce.dll - Sample
-;p3p.dll - I don't know
-;p3p.xpt - I don't know
 ;proxytext.xpt - Test
 ;tdynamic.dll - Test
 ;xpcomsmp.dll - Sample
 ;xpcomsample.xpt - Sample
 ;xpctest.dll  -Test
 ;xpconnect_tests.xpt - Test
 

--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@@ -281,20 +281,16 @@ bin/res/mathml.css
 bin/res/rdf/folder-closed.gif
 bin/res/rdf/folder-open.gif
 bin/res/rdf/loading.gif
 bin/res/html/*
 bin/res/fonts/*
 bin/res/dtd/*
 bin/res/effective_tld_names.dat
 
-; p3p
-bin/components/p3p.xpt
-bin/components/libp3p.so
-
 [mail]
 bin/components/libmeta_mail.so
 bin/components/addrbook.xpt
 bin/components/mailnews.xpt
 bin/components/mime.xpt
 bin/components/msgbase.xpt
 bin/components/msgcompose.xpt
 bin/components/msgdb.xpt

--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@@ -215,20 +215,16 @@ bin\components\xulappinfo.xpt
 
 ; webservices
 bin\components\websrvcs.dll
 bin\components\websrvcs.xpt
 
 ; Roaming
 bin\chrome\sroaming.jar
 
-; p3p
-bin\components\p3p.dll
-bin\components\p3p.xpt
-
 ; chrome stuff
 bin\chrome\help.jar
 bin\chrome\comm.jar
 bin\chrome\content-packs.jar
 bin\chrome\toolkit.jar
 bin\chrome\modern.jar
 bin\chrome\classic.jar
 bin\chrome\comm\*

--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -320,20 +320,16 @@ bin/libprldap60.so
 bin/libldif60.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 
 ; Roaming
 bin/components/libsroaming.so
 bin/chrome/sroaming.jar
 
-; p3p
-bin/components/p3p.xpt
-bin/components/libp3p.so
-
 ; classic theme
 bin/chrome/classic.jar
 bin/chrome/classic.manifest
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 
 ; modern theme

--- a/xpinstall/packager/unix/browser.jst
+++ b/xpinstall/packager/unix/browser.jst
@@ -110,17 +110,16 @@ if (verifyDiskSpace(communicatorFolder, 
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/navigator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/");
 
     if (err==SUCCESS)
     {
 	    err = performInstall(); 
 	    logComment("performInstall() returned: " + err);
         if (! ('buildID' in Install))
         {
           logComment("Running Pre-Mozilla 0.9.1");

--- a/xpinstall/packager/unix/langenus.jst
+++ b/xpinstall/packager/unix/langenus.jst
@@ -61,17 +61,16 @@ if (verifyDiskSpace(fProgram, srDest))
         registerChrome(chromeType, cf, localeName + "necko/");
         registerChrome(chromeType, cf, localeName + "mozldap/");
         registerChrome(chromeType, cf, localeName + "autoconfig/");
         registerChrome(chromeType, cf, localeName + "cookie/");
         registerChrome(chromeType, cf, localeName + "wallet/");
         registerChrome(chromeType, cf, localeName + "help/");
         registerChrome(chromeType, cf, localeName + "pippki/");
         registerChrome(chromeType, cf, localeName + "pipnss/");
-        registerChrome(chromeType, cf, localeName + "p3p/");
 
         registerChrome(chromeType, cf, localeName + "global-region/");
         registerChrome(chromeType, cf, localeName + "communicator-region/");
         registerChrome(chromeType, cf, localeName + "editor-region/");
         registerChrome(chromeType, cf, localeName + "messenger-region/");
         registerChrome(chromeType, cf, localeName + "navigator-region/");
 
         registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");

--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@@ -692,17 +692,16 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/navigator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/communicator/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/editor/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/global/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/messenger/");
     registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/");
     registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/");
 
     // We need to register the psm chrome files.
     // We're checking to see if they exist first in case
     // they were not built and packaged up.
     var pki = getFolder("Chrome", "pippki.jar");
     if(File.exists(pki)) 
       registerChrome(CONTENT | DELAYED_CHROME, pki, "content/pippki/");
 

--- a/xpinstall/packager/windows/langenus.jst
+++ b/xpinstall/packager/windows/langenus.jst
@@ -63,17 +63,16 @@ if(verifyDiskSpace(fProgram, srDest))
     registerChrome(chromeType, cf, localeName + "necko/");
     registerChrome(chromeType, cf, localeName + "mozldap/");
     registerChrome(chromeType, cf, localeName + "autoconfig/");
     registerChrome(chromeType, cf, localeName + "cookie/");
     registerChrome(chromeType, cf, localeName + "wallet/");
     registerChrome(chromeType, cf, localeName + "help/");
     registerChrome(chromeType, cf, localeName + "pippki/");
     registerChrome(chromeType, cf, localeName + "pipnss/");
-    registerChrome(chromeType, cf, localeName + "p3p/");
 
     registerChrome(chromeType, cf, localeName + "global-region/");
     registerChrome(chromeType, cf, localeName + "communicator-region/");
     registerChrome(chromeType, cf, localeName + "editor-region/");
     registerChrome(chromeType, cf, localeName + "messenger-region/");
     registerChrome(chromeType, cf, localeName + "navigator-region/");
 
     registerChrome(chromeType, cf, localeName + "global-platform/" + platformNode + "/");