Get P3P support building on Mac. Bug 62399. r=harishd. Not part of the build.

extensions/p3p/public/MANIFEST

@@ -22,3 +22,6 @@
 #
 # This is a list of local files which get exported
 #
+
+nsIP3PService.idl
+nsIP3PUI.idl

extensions/p3p/src/nsIP3PCService.h

@@ -28,18 +28,18 @@
 #include "nsIP3PTag.h"
 #include "nsIP3PDataStruct.h"
 
-#include <nsCOMPtr.h>
-#include <nsIP3PService.h>
+#include "nsCOMPtr.h"
+#include "nsIP3PService.h"
 
-#include <nsIURI.h>
-#include <nsIDocShellTreeItem.h>
-#include <nsIDOMWindowInternal.h>
-#include <nsIContent.h>
+#include "nsIURI.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIContent.h"
 
-#include <nsIRDFDataSource.h>
+#include "nsIRDFDataSource.h"
 
-#include <nsString.h>
-#include <nsVoidArray.h>
+#include "nsString.h"
+#include "nsVoidArray.h"
 
 
 #define NS_IP3PCSERVICE_IID_STR "31430e56-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PCUI.h

@@ -25,7 +25,7 @@
 #define nsIP3PUI_h__
 
 #include "nsISupports.h"
-#include <nsIP3PUI.h>
+#include "nsIP3PUI.h"
 
 #define NS_IP3PCUI_IID_STR "31430e62-d43d-11d3-9781-002035aee991"
 #define NS_IP3PCUI_IID     {0x31430e62, 0xd43d, 0x11d3, { 0x97, 0x81, 0x00, 0x20, 0x35, 0xae, 0xe9, 0x91 }}

extensions/p3p/src/nsIP3PDataStruct.h

@@ -26,13 +26,13 @@
 
 #include "nsIP3PTag.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
-#include <nsISupportsArray.h>
-#include <nsISimpleEnumerator.h>
+#include "nsISupportsArray.h"
+#include "nsISimpleEnumerator.h"
 
 
 #define NS_IP3PDATASTRUCT_IID_STR "31430e5f-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PPolicy.h

@@ -26,7 +26,7 @@
 
 #include "nsP3PXMLProcessor.h"
 
-#include <nsIRDFDataSource.h>
+#include "nsIRDFDataSource.h"
 
 
 #define NS_IP3PPOLICY_IID_STR "31430e5b-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PPreferences.h

@@ -24,10 +24,10 @@
 #ifndef nsIP3PPreferences_h__
 #define nsIP3PPreferences_h__
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
 #define NS_IP3PPREFERENCES_IID_STR "31430e57-d43d-11d3-9781-002035aee991"
 #define NS_IP3PPREFERENCES_IID     {0x31430e57, 0xd43d, 0x11d3, { 0x97, 0x81, 0x00, 0x20, 0x35, 0xae, 0xe9, 0x91 }}

extensions/p3p/src/nsIP3PPrivacyResult.h

@@ -26,14 +26,14 @@
 
 #include "nsIP3PPolicy.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsIRDFDataSource.h>
+#include "nsIRDFDataSource.h"
 
-#include <nsISupportsArray.h>
+#include "nsISupportsArray.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
 
 #define NS_IP3PPRIVACYRESULT_IID_STR "31430e5d-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PReference.h

@@ -27,11 +27,11 @@
 #include "nsIP3PPolicyRefFile.h"
 #include "nsIP3PPolicy.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsVoidArray.h>
-#include <nsString.h>
+#include "nsVoidArray.h"
+#include "nsString.h"
 
 
 #define NS_IP3PREFERENCE_IID_STR "31430e5a-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PTag.h

@@ -24,15 +24,15 @@
 #ifndef nsIP3PTag_h__
 #define nsIP3PTag_h__
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsIDOMNode.h>
+#include "nsIDOMNode.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
-#include <nsISupportsArray.h>
-#include <nsISimpleEnumerator.h>
+#include "nsISupportsArray.h"
+#include "nsISimpleEnumerator.h"
 
 
 #define NS_IP3PTAG_IID_STR "31430e5e-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PUIService.h

@@ -26,8 +26,8 @@
 
 #include "nsISupports.h"
 #include "nsIP3PCUI.h"
-#include <nsIDocShellTreeItem.h>
-#include <nsIDOMWindowInternal.h>
+#include "nsIDocShellTreeItem.h"
+#include "nsIDOMWindowInternal.h"
 
 
 #define NS_IP3PUISERVICE_IID_STR "31430e52-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PURIInformation.h

@@ -24,13 +24,13 @@
 #ifndef nsIP3PURIInformation_h__
 #define nsIP3PURIInformation_h__
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsIURI.h>
+#include "nsIURI.h"
 
-#include <nsString.h>
-#include <nsVoidArray.h>
+#include "nsString.h"
+#include "nsVoidArray.h"
 
 
 #define NS_IP3PURIINFORMATION_IID_STR "31430e58-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsIP3PXMLListener.h

@@ -24,10 +24,10 @@
 #ifndef nsIP3PXMLListener_h__
 #define nsIP3PXMLListener_h__
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
 
 #define NS_IP3PXMLLISTENER_IID_STR "31430e61-d43d-11d3-9781-002035aee991"

extensions/p3p/src/nsP3PDataSchema.cpp

@@ -29,19 +29,19 @@
 #include "nsP3PSimpleEnumerator.h"
 #include "nsP3PLogging.h"
 
-#include <nsIDirectoryService.h>
-#include <nsIProperties.h>
-#include <nsIFile.h>
+#include "nsIDirectoryService.h"
+#include "nsIProperties.h"
+#include "nsIFile.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsXPIDLString.h>
+#include "nsXPIDLString.h"
 
-#include <nsIFileLocator.h>
-#include <nsFileLocations.h>
-#include <nsIFileSpec.h>
+#include "nsIFileLocator.h"
+#include "nsFileLocations.h"
+#include "nsIFileSpec.h"
 
-#include <nsAutoLock.h>
+#include "nsAutoLock.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PDataSchema.h

@@ -28,8 +28,8 @@
 #include "nsIP3PXMLListener.h"
 #include "nsIP3PDataStruct.h"
 
-#include <nsHashtable.h>
-#include <nsVoidArray.h>
+#include "nsHashtable.h"
+#include "nsVoidArray.h"
 
 
 class nsP3PDataSchema : public nsIP3PDataSchema,

extensions/p3p/src/nsP3PDataStruct.cpp

@@ -27,7 +27,7 @@
 #include "nsP3PTags.h"
 #include "nsP3PSimpleEnumerator.h"
 
-#include <nsIComponentManager.h>
+#include "nsIComponentManager.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PDataStruct.h

@@ -26,7 +26,7 @@
 
 #include "nsIP3PDataStruct.h"
 
-#include <nsVoidArray.h>
+#include "nsVoidArray.h"
 
 
 class nsP3PDataStruct : public nsIP3PDataStruct {

extensions/p3p/src/nsP3PHTTPNotify.cpp

@@ -26,17 +26,17 @@
 #include "nsP3PHTTPNotify.h"
 #include "nsP3PLogging.h"
 
-#include <nsIServiceManager.h>
+#include "nsIServiceManager.h"
 
-#include <nsIHTTPHeader.h>
-#include <nsIURI.h>
-#include <nsILoadGroup.h>
+#include "nsIHTTPHeader.h"
+#include "nsIURI.h"
+#include "nsILoadGroup.h"
 
-#include <nsIInterfaceRequestor.h>
-#include <nsIDocumentLoader.h>
+#include "nsIInterfaceRequestor.h"
+#include "nsIDocumentLoader.h"
 
-#include <nsString.h>
-#include <nsXPIDLString.h>
+#include "nsString.h"
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PHTTPNotify.h

@@ -26,17 +26,17 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIHttpNotify.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIHttpNotify.h"
 
-#include <nsINetModuleMgr.h>
+#include "nsINetModuleMgr.h"
 
-#include <nsIHTTPChannel.h>
+#include "nsIHTTPChannel.h"
 
-#include <nsIDocShellTreeItem.h>
+#include "nsIDocShellTreeItem.h"
 
-#include <nsIAtom.h>
+#include "nsIAtom.h"
 
 
 class nsP3PHTTPNotify : public nsIHTTPNotify {

extensions/p3p/src/nsP3PLogging.h

@@ -24,7 +24,7 @@
 #ifndef nsP3PLogging_h__
 #define nsP3PLogging_h__
 
-#include <prlog.h>
+#include "prlog.h"
 
 #ifndef P3P_LOG_DEFINITION
 extern PRLogModuleInfo  *gP3PLogModule;

extensions/p3p/src/nsP3PModule.cpp

@@ -25,7 +25,7 @@
 #include "nsP3PUIService.h"
 #include "nsP3PUI.h"
 
-#include <nsIGenericFactory.h>
+#include "nsIGenericFactory.h"
 
 
 // Define a table of CIDs implemented by this module:

extensions/p3p/src/nsP3PObserverFormSubmit.cpp

@@ -26,11 +26,11 @@
 
 #include "nsP3PObserverFormSubmit.h"
 
-#include <nsIServiceManager.h>
+#include "nsIServiceManager.h"
 
-#include <nsIPresShell.h>
+#include "nsIPresShell.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PObserverFormSubmit.h

@@ -26,17 +26,17 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIObserver.h>
-#include <nsIContent.h>  // nsIFormSubmitObserver.h does not include nsIContent...
-#include <nsIFormSubmitObserver.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsIContent.h"  // nsIFormSubmitObserver.h does not include nsIContent...
+#include "nsIFormSubmitObserver.h"
 
-#include <nsIObserverService.h>
+#include "nsIObserverService.h"
 
-#include <nsIContent.h>
-#include <nsIDOMWindowInternal.h>
-#include <nsIURI.h>
+#include "nsIContent.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIURI.h"
 
 
 class nsP3PObserverFormSubmit : public nsIObserver,

extensions/p3p/src/nsP3PObserverHTML.cpp

@@ -27,17 +27,17 @@
 #include "nsP3PObserverUtils.h"
 #include "nsP3PLogging.h"
 
-#include <nsIServiceManager.h>
+#include "nsIServiceManager.h"
 
-#include <nsIParser.h>
+#include "nsIParser.h"
 
-#include <nsIDocShell.h>
-#include <nsIDocShellTreeItem.h>
-#include <nsIWebNavigation.h>
-#include <nsIDocument.h>
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.h"
+#include "nsIDocument.h"
 
-#include <nsString.h>
-#include <nsXPIDLString.h>
+#include "nsString.h"
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PObserverHTML.h

@@ -26,13 +26,13 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIObserver.h>
-#include <nsIElementObserver.h>
-#include <nsWeakReference.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsIElementObserver.h"
+#include "nsWeakReference.h"
 
-#include <nsIObserverService.h>
+#include "nsIObserverService.h"
 
 
 extern

extensions/p3p/src/nsP3PObserverLayout.cpp

@@ -26,22 +26,22 @@
 #include "nsP3PObserverLayout.h"
 #include "nsP3PLogging.h"
 
-#include <nsCOMPtr.h>
-#include <nsIServiceManager.h>
+#include "nsCOMPtr.h"
+#include "nsIServiceManager.h"
 
-#include <nsIPresShell.h>
+#include "nsIPresShell.h"
 
-#include <nsIDocShellTreeItem.h>
-#include <nsIWebNavigation.h>
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.h"
 
-#include <nsCURILoader.h>
-#include <nsIURILoader.h>
-#include <nsILoadGroup.h>
-#include <nsIHTTPChannel.h>
-#include <nsISimpleEnumerator.h>
+#include "nsCURILoader.h"
+#include "nsIURILoader.h"
+#include "nsILoadGroup.h"
+#include "nsIHTTPChannel.h"
+#include "nsISimpleEnumerator.h"
 
-#include <nsString.h>
-#include <nsXPIDLString.h>
+#include "nsString.h"
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PObserverLayout.h

@@ -26,15 +26,15 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIObserver.h>
-#include <nsWeakReference.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsWeakReference.h"
 
-#include <nsIObserverService.h>
+#include "nsIObserverService.h"
 
-#include <nsIDocShell.h>
-#include <nsIURI.h>
+#include "nsIDocShell.h"
+#include "nsIURI.h"
 
 
 class nsP3PObserverLayout : public nsIObserver,

extensions/p3p/src/nsP3PObserverUtils.cpp

@@ -26,8 +26,8 @@
 #include "nsP3PObserverUtils.h"
 #include "nsP3PLogging.h"
 
-#include <nsString.h>
-#include <nsXPIDLString.h>
+#include "nsString.h"
+#include "nsXPIDLString.h"
 
 
 // P3P Observer Utils: ExamineLINKTag

extensions/p3p/src/nsP3PObserverUtils.h

@@ -26,13 +26,13 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCom.h>
+#include "nsCom.h"
 
-#include <nsIURI.h>
+#include "nsIURI.h"
 
-#include <nsIDocShellTreeItem.h>
+#include "nsIDocShellTreeItem.h"
 
-#include <nsVoidArray.h>
+#include "nsVoidArray.h"
 
 
 class nsP3PObserverUtils {

extensions/p3p/src/nsP3PObserverXML.h

@@ -26,13 +26,13 @@
 
 #include "nsIP3PCService.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIObserver.h>
-#include <nsIElementObserver.h>
-#include <nsWeakReference.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIObserver.h"
+#include "nsIElementObserver.h"
+#include "nsWeakReference.h"
 
-#include <nsIObserverService.h>
+#include "nsIObserverService.h"
 
 
 extern

extensions/p3p/src/nsP3PPolicy.cpp

@@ -29,15 +29,15 @@
 #include "nsP3PSimpleEnumerator.h"
 #include "nsP3PLogging.h"
 
-#include <nsIServiceManager.h>
+#include "nsIServiceManager.h"
 
-#include <rdf.h>
-#include <nsRDFCID.h>
+#include "rdf.h"
+#include "nsRDFCID.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsXPIDLString.h>
-#include <prprf.h>
+#include "nsXPIDLString.h"
+#include "prprf.h"
 
 
 // ****************************************************************************
@@ -92,7 +92,7 @@ NS_NewP3PPolicy( nsString&      aPolicyURISpec,
 // P3P Policy: Constructor
 nsP3PPolicy::nsP3PPolicy( )
   : mDataSchemas( 32, PR_TRUE ),
-    mPrefsTime( nsnull ),
+    mPrefsTime( LL_ZERO ),
     mPrefsResult( P3P_PRIVACY_MET ),
     mFailedDataTagRefs( 64, PR_TRUE ) {
 

extensions/p3p/src/nsP3PPolicy.h

@@ -28,14 +28,14 @@
 #include "nsIP3PDataSchema.h"
 #include "nsIP3PXMLListener.h"
 
-#include <nsIRDFService.h>
-#include <nsIRDFDataSource.h>
-#include <nsIRDFResource.h>
-#include <nsIRDFContainerUtils.h>
+#include "nsIRDFService.h"
+#include "nsIRDFDataSource.h"
+#include "nsIRDFResource.h"
+#include "nsIRDFContainerUtils.h"
 
-#include <nsHashtable.h>
-#include <nsVoidArray.h>
-#include <nsSupportsArray.h>
+#include "nsHashtable.h"
+#include "nsVoidArray.h"
+#include "nsSupportsArray.h"
 
 
 class nsP3PPolicy : public nsIP3PPolicy,

extensions/p3p/src/nsP3PPolicyRefFile.cpp

@@ -29,9 +29,9 @@
 #include "nsP3PSimpleEnumerator.h"
 #include "nsP3PLogging.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsXPIDLString.h>
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PPolicyRefFile.h

@@ -26,8 +26,8 @@
 
 #include "nsIP3PPolicyRefFile.h"
 
-#include <nsHashtable.h>
-#include <nsVoidArray.h>
+#include "nsHashtable.h"
+#include "nsVoidArray.h"
 
 
 class nsP3PPolicyRefFile : public nsIP3PPolicyRefFile,

extensions/p3p/src/nsP3PPreferences.cpp

@@ -25,8 +25,8 @@
 #include "nsP3PPreferences.h"
 #include "nsP3PLogging.h"
 
-#include <nsNetUtil.h>
-#include <nsString.h>
+#include "nsNetUtil.h"
+#include "nsString.h"
 
 
 // ****************************************************************************
@@ -253,7 +253,7 @@ nsP3PPreferences::GetTimePrefsLastChanged( PRTime *aResult ) {
 NS_IMETHODIMP_( PRBool )
 nsP3PPreferences::PrefsChanged( PRTime time ) {
 
-  return (time < mTimePrefsLastChanged);
+  return (LL_CMP(time, <, mTimePrefsLastChanged));
 }
 
 // P3P Preferences:  boolean preference retreival routine

extensions/p3p/src/nsP3PPreferences.h

@@ -27,8 +27,8 @@
 #include "nsIP3PPreferences.h"
 #include "nsIP3PCService.h"
 
-#include <nsIPref.h>
-#include <nsHashtable.h>
+#include "nsIPref.h"
+#include "nsHashtable.h"
 
 
 class nsP3PPreferences : public nsIP3PPreferences {

extensions/p3p/src/nsP3PPrivacyResult.cpp

@@ -27,14 +27,14 @@
 #include "nsP3PSimpleEnumerator.h"
 #include "nsP3PLogging.h"
 
-#include <nsIServiceManager.h>
-#include <nsIComponentManager.h>
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
 
-#include <rdf.h>
-#include <nsRDFCID.h>
+#include "rdf.h"
+#include "nsRDFCID.h"
 
-#include <nsXPIDLString.h>
-#include <prprf.h>
+#include "nsXPIDLString.h"
+#include "prprf.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PPrivacyResult.h

@@ -27,10 +27,10 @@
 #include "nsIP3PPrivacyResult.h"
 #include "nsIP3PCService.h"
 
-#include <nsIRDFService.h>
-#include <nsIRDFCompositeDataSource.h>
-#include <nsIRDFResource.h>
-#include <nsIRDFContainerUtils.h>
+#include "nsIRDFService.h"
+#include "nsIRDFCompositeDataSource.h"
+#include "nsIRDFResource.h"
+#include "nsIRDFContainerUtils.h"
 
 
 class nsP3PPrivacyResult : public nsIP3PPrivacyResult {

extensions/p3p/src/nsP3PReference.cpp

@@ -26,9 +26,9 @@
 #include "nsP3PReference.h"
 #include "nsP3PLogging.h"
 
-#include <nsIComponentManager.h>
+#include "nsIComponentManager.h"
 
-#include <nsXPIDLString.h>
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PReference.h

@@ -26,10 +26,10 @@
 
 #include "nsIP3PReference.h"
 
-#include <nsAutoLock.h>
+#include "nsAutoLock.h"
 
-#include <nsHashtable.h>
-#include <nsSupportsArray.h>
+#include "nsHashtable.h"
+#include "nsSupportsArray.h"
 
 
 class nsP3PReference : public nsIP3PReference {

extensions/p3p/src/nsP3PService.cpp

@@ -41,23 +41,23 @@
 #include "nsP3PPrivacyResult.h"
 #include "nsP3PLogging.h"
 
-#include <nsIGenericFactory.h>
+#include "nsIGenericFactory.h"
 
-#include <nsIHTTPProtocolHandler.h>
+#include "nsIHTTPProtocolHandler.h"
 
-#include <nsLayoutCID.h>
-#include <nsINameSpaceManager.h>
+#include "nsLayoutCID.h"
+#include "nsINameSpaceManager.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsIDOMNode.h>
+#include "nsIDOMNode.h"
 
-#include <nsIWebNavigation.h>
+#include "nsIWebNavigation.h"
 
-#include <nsString.h>
-#include <nsXPIDLString.h>
+#include "nsString.h"
+#include "nsXPIDLString.h"
 
-#include <prprf.h>
+#include "prprf.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PService.h

@@ -33,26 +33,26 @@
 #include "nsIP3PTag.h"
 #include "nsIP3PPreferences.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIComponentManager.h>
-#include <nsIGenericFactory.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIComponentManager.h"
+#include "nsIGenericFactory.h"
 
-#include <nsICategoryManager.h>
+#include "nsICategoryManager.h"
 
-#include <nsICookieService.h>
+#include "nsICookieService.h"
 
-#include <nsIObserver.h>
+#include "nsIObserver.h"
 
-#include <nsIHTTPChannel.h>
-#include <nsIHttpNotify.h>
+#include "nsIHTTPChannel.h"
+#include "nsIHttpNotify.h"
 
-#include <nsDeque.h>
-#include <nsHashtable.h>
+#include "nsDeque.h"
+#include "nsHashtable.h"
 
-#include <nsIStringBundle.h>
+#include "nsIStringBundle.h"
 
-#include <prlog.h>
+#include "prlog.h"
 
 class nsP3PServiceReadData;
 

extensions/p3p/src/nsP3PSimpleEnumerator.h

@@ -24,10 +24,10 @@
 #ifndef nsP3PSimpleEnumerator_h__
 #define nsP3PSimpleEnumerator_h__
 
-#include <nsCOMPtr.h>
-#include <nsISimpleEnumerator.h>
+#include "nsCOMPtr.h"
+#include "nsISimpleEnumerator.h"
 
-#include <nsISupportsArray.h>
+#include "nsISupportsArray.h"
 
 
 class nsP3PSimpleEnumerator : public nsISimpleEnumerator {

extensions/p3p/src/nsP3PTags.cpp

@@ -27,7 +27,7 @@
 #include "nsP3PSimpleEnumerator.h"
 #include "nsP3PLogging.h"
 
-#include <nsIComponentManager.h>
+#include "nsIComponentManager.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PTags.h

@@ -27,7 +27,7 @@
 #include "nsIP3PTag.h"
 #include "nsP3PXMLUtils.h"
 
-#include <nsVoidArray.h>
+#include "nsVoidArray.h"
 
 
 class nsP3PTag : public nsIP3PTag {

extensions/p3p/src/nsP3PUI.cpp

@@ -21,34 +21,34 @@
  *
  */
 
-#include <nspr.h>
+#include "nspr.h"
 
 #include "nsP3PDefines.h"
 #include "nsP3PUI.h"
 #include "nsP3PLogging.h"
-#include <nsIServiceManager.h>
-#include <nsIInterfaceRequestor.h>
+#include "nsIServiceManager.h"
+#include "nsIInterfaceRequestor.h"
 
-#include <nsIObserverService.h>
-#include <nsIDocumentLoader.h>
-#include <nsCURILoader.h>
-#include <nsIDocShell.h>
-#include <nsIDocShellTreeItem.h>
-#include <nsIWebNavigation.h>
-#include <nsIDocumentViewer.h>
-#include <nsCURILoader.h>
-#include <nsIDocument.h>
-#include <nsIDOMHTMLDocument.h>
-#include <nsIDOMXULDocument.h>
-#include <nsIContent.h>
-#include <nsIWebProgress.h>
-#include <nsIChannel.h>
-#include <nsIURI.h>
-#include <nsIScriptGlobalObject.h>
-#include <nsIScriptGlobalObjectOwner.h>
-#include <nsIPrompt.h>
+#include "nsIObserverService.h"
+#include "nsIDocumentLoader.h"
+#include "nsCURILoader.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.h"
+#include "nsIDocumentViewer.h"
+#include "nsCURILoader.h"
+#include "nsIDocument.h"
+#include "nsIDOMHTMLDocument.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIContent.h"
+#include "nsIWebProgress.h"
+#include "nsIChannel.h"
+#include "nsIURI.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptGlobalObjectOwner.h"
+#include "nsIPrompt.h"
 
-#include <prmem.h>
+#include "prmem.h"
 
 
 NS_IMPL_ISUPPORTS4( nsP3PUI, nsIP3PUI,
@@ -497,7 +497,7 @@ nsP3PUI::OnStateChange(nsIWebProgress *aWebProgress,
               // Check if this is a redirection
               nsLoadFlags loadFlags = 0;
 
-              rv = pChannel->GetLoadAttributes(&loadFlags);
+              rv = aRequest->GetLoadFlags(&loadFlags);
               if (NS_SUCCEEDED( rv )) {
               
                 if (loadFlags & nsIChannel::LOAD_REPLACE) {

extensions/p3p/src/nsP3PUI.h

@@ -27,19 +27,19 @@
 #include "nsIP3PUI.h"
 #include "nsIP3PUIService.h"
 #include "nsIP3PCService.h"
-#include <nsIPref.h>
-#include <nsCOMPtr.h>
-#include <nsIDOMElement.h>
-#include <nsIObserver.h>
-#include <nsIDOMWindow.h>
-#include <nsXPIDLString.h>
-#include <nsString.h>
-#include <nsIDocShell.h>
-#include <nsIURI.h>
-#include <nsIDocShellTreeItem.h>
-#include <nsIWebProgressListener.h>
-#include <nsIFormSubmitObserver.h>
-#include <nsWeakReference.h>
+#include "nsIPref.h"
+#include "nsCOMPtr.h"
+#include "nsIDOMElement.h"
+#include "nsIObserver.h"
+#include "nsIDOMWindow.h"
+#include "nsXPIDLString.h"
+#include "nsString.h"
+#include "nsIDocShell.h"
+#include "nsIURI.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIWebProgressListener.h"
+#include "nsIFormSubmitObserver.h"
+#include "nsWeakReference.h"
 
 #define P3P_STATUS_NO_P3P               0
 #define P3P_STATUS_NO_POLICY            1

extensions/p3p/src/nsP3PUIService.cpp

@@ -26,13 +26,13 @@
 #include "nsIP3PCUI.h"
 #include "nsP3PLogging.h"
 
-#include <nsIGenericFactory.h>
-#include <nsIP3PUI.h>
-#include <nsIScriptGlobalObject.h>
-#include <nsIScriptGlobalObjectOwner.h>
-#include <nsLayoutCID.h>
-#include <nsIPromptService.h>
-#include <nsIDOMWindow.h>
+#include "nsIGenericFactory.h"
+#include "nsIP3PUI.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptGlobalObjectOwner.h"
+#include "nsLayoutCID.h"
+#include "nsIPromptService.h"
+#include "nsIDOMWindow.h"
 
 // ****************************************************************************
 // nsP3PUIService Implementation routines

extensions/p3p/src/nsP3PUIService.h

@@ -24,14 +24,14 @@
 #ifndef nsP3PUIService_h__
 #define nsP3PUIService_h__
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIDOMWindowInternal.h>
-#include <nsIDocShellTreeItem.h>
-#include <nsIP3PUI.h>
-#include <nsIPref.h>
-#include <nsDeque.h>
-#include <nsHashtable.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIDOMWindowInternal.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIP3PUI.h"
+#include "nsIPref.h"
+#include "nsDeque.h"
+#include "nsHashtable.h"
 #include "nsIP3PCService.h"
 #include "nsIP3PUIService.h"
 

extensions/p3p/src/nsP3PURIInformation.cpp

@@ -26,9 +26,9 @@
 #include "nsP3PURIInformation.h"
 #include "nsP3PLogging.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsXPIDLString.h>
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PURIInformation.h

@@ -26,7 +26,7 @@
 
 #include "nsIP3PURIInformation.h"
 
-#include <nsHashtable.h>
+#include "nsHashtable.h"
 
 
 class nsP3PURIInformation : public nsIP3PURIInformation {

extensions/p3p/src/nsP3PXMLProcessor.cpp

@@ -28,22 +28,22 @@
 #include "nsP3PTags.h"
 #include "nsP3PLogging.h"
 
-#include <nsIDOMElement.h>
-#include <nsIDOMEventTarget.h>
-#include <nsIDOMNSDocument.h>
+#include "nsIDOMElement.h"
+#include "nsIDOMEventTarget.h"
+#include "nsIDOMNSDocument.h"
 
-#include <nsIChannel.h>
-#include <nsIInputStream.h>
-#include <nsIDOMParser.h>
+#include "nsIChannel.h"
+#include "nsIInputStream.h"
+#include "nsIDOMParser.h"
 
-#include <nsIHTTPChannel.h>
+#include "nsIHTTPChannel.h"
 
-#include <nsLayoutCID.h>
+#include "nsLayoutCID.h"
 
-#include <nsNetUtil.h>
+#include "nsNetUtil.h"
 
-#include <nsIHTTPHeader.h>
-#include <nsIDocument.h>
+#include "nsIHTTPHeader.h"
+#include "nsIDocument.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PXMLProcessor.h

@@ -28,27 +28,27 @@
 #include "nsIP3PTag.h"
 #include "nsIP3PXMLListener.h"
 
-#include <nsCOMPtr.h>
-#include <nsISupports.h>
-#include <nsIDOMEventListener.h>
-#include <nsIHttpNotify.h>
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
+#include "nsIDOMEventListener.h"
+#include "nsIHttpNotify.h"
 
-#include <nsAutoLock.h>
+#include "nsAutoLock.h"
 
-#include <nsIXMLHttpRequest.h>
+#include "nsIXMLHttpRequest.h"
 
-#include <nsIDOMDocument.h>
-#include <nsIDOMNode.h>
+#include "nsIDOMDocument.h"
+#include "nsIDOMNode.h"
 
-#include <nsINetModuleMgr.h>
-#include <nsIURI.h>
-#include <nsIHTTPChannel.h>
+#include "nsINetModuleMgr.h"
+#include "nsIURI.h"
+#include "nsIHTTPChannel.h"
 
-#include <nsISupportsArray.h>
+#include "nsISupportsArray.h"
 
-#include <nsString.h>
+#include "nsString.h"
 
-#include <prtime.h>
+#include "prtime.h"
 
 
 class nsP3PXMLProcessor : public nsISupports {

extensions/p3p/src/nsP3PXMLUtils.cpp

@@ -25,16 +25,16 @@
 
 #include "nsP3PXMLUtils.h"
 
-#include <nsIComponentManager.h>
+#include "nsIComponentManager.h"
 
-#include <nsIDOMNodeList.h>
-#include <nsIDOMNamedNodeMap.h>
-#include <nsIDOMAttr.h>
-#include <nsIDOMText.h>
+#include "nsIDOMNodeList.h"
+#include "nsIDOMNamedNodeMap.h"
+#include "nsIDOMAttr.h"
+#include "nsIDOMText.h"
 
-#include <nsITextContent.h>
+#include "nsITextContent.h"
 
-#include <nsXPIDLString.h>
+#include "nsXPIDLString.h"
 
 
 // ****************************************************************************

extensions/p3p/src/nsP3PXMLUtils.h

@@ -24,12 +24,12 @@
 #ifndef nsP3PXMLUtils_h__
 #define nsP3PXMLUtils_h__
 
-#include <nsCom.h>
+#include "nsCom.h"
 
-#include <nsIDOMNode.h>
+#include "nsIDOMNode.h"
 
-#include <nsVoidArray.h>
-#include <nsString.h>
+#include "nsVoidArray.h"
+#include "nsString.h"
 
 
 class nsP3PXMLUtils {