Adding support to enable P3P upon request. r=heikki, sr=alecf,sfraser a=asa

build/mac/build_scripts/MozillaBuildList.pm

@@ -349,10 +349,6 @@ sub ProcessJarManifests()
     {
       CreateJarFromManifest(":mozilla:extensions:inspector:jar.mn", $chrome_dir, \%jars);
     }
-    if ($main::options{p3p})
-    {
-      CreateJarFromManifest(":mozilla:extensions:p3p:resources:jar.mn", $chrome_dir, \%jars);
-    }
     if ($main::options{jsd} && $main::options{venkman})
     {
       CreateJarFromManifest(":mozilla:extensions:venkman:resources:jar.mn", $chrome_dir, \%jars);
@@ -908,7 +904,8 @@ sub BuildClientDist()
     #P3P
     if ($main::options{p3p})
     {
-        InstallFromManifest(":mozilla:extensions:p3p:public:MANIFEST", "$distdirectory:idl:");
+        InstallFromManifest(":mozilla:extensions:p3p:public:MANIFEST_IDL", "$distdirectory:idl:");
+        InstallFromManifest(":mozilla:extensions:p3p:public:MANIFEST",     "$distdirectory:p3p:");
     }
 
     #JS DEBUGGER

configure.in

@@ -3135,7 +3135,7 @@ if test -n "$SUNCTL"; then
   MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
 fi
 
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl" 
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl p3p" 
 
 MOZ_ARG_ENABLE_STRING(extensions,
 [  --enable-extensions     Enable extensions],

extensions/makefile.win

@@ -31,6 +31,9 @@ DIRS = wallet \
 !endif
 	content-packs \
 	help \
+!if defined(MOZ_ENABLE_P3P)
+  p3p \
+!endif
 	pref \
 !if !defined(DISABLE_XSLT)
 	transformiix \

extensions/p3p/public/MANIFEST_IDL

@@ -0,0 +1,2 @@
+nsIP3PService.idl
+

extensions/p3p/src/nsP3PService.cpp

@@ -140,7 +140,7 @@ nsP3PService::ProcessResponseHeader(nsIHttpChannel* aHttpChannel)
       }
 
       nsXPIDLCString spec;
-      uri->GetSpec(getter_Copies(spec));
+      uri->GetSpec(spec);
 
       result = mCompactPolicy->OnHeaderAvailable(p3pHeader,spec);
     }
@@ -206,7 +206,7 @@ nsP3PService::GetConsent(const char* aURI,
     
     if (uri) {
       nsXPIDLCString spec;
-      uri->GetSpec(getter_Copies(spec));
+      uri->GetSpec(spec);
 
       if (aURI) {
         NS_ASSERTION(nsCRT::strcmp(aURI,spec) == 0,"URIs don't match");