nsIContentPolicy: Numbers should not be omitted in nsIContentPolicyBase.idl, rewrite uuid

4 files changed, 15 insertions, 14 deletions

diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl
index efb0a30a3..200b97fbc 100644
--- a/dom/base/nsIContentPolicy.idl
+++ b/dom/base/nsIContentPolicy.idl
@@ -20,7 +20,7 @@ interface nsIPrincipal;
  * by launching a dialog to prompt the user for something).
  */
 
-[scriptable,uuid(d472863b-adb2-4448-aa8f-6c33c0c4c633)]
+[scriptable,uuid(64a5ae16-6836-475c-9938-4b6cc1eee8fb)]
 interface nsIContentPolicy : nsIContentPolicyBase
 {
   /**
diff --git a/dom/base/nsIContentPolicyBase.idl b/dom/base/nsIContentPolicyBase.idl
index 01c1d803c..908e562a8 100644
--- a/dom/base/nsIContentPolicyBase.idl
+++ b/dom/base/nsIContentPolicyBase.idl
@@ -24,7 +24,7 @@ typedef unsigned long nsContentPolicyType;
  * by launching a dialog to prompt the user for something).
  */
 
-[scriptable,uuid(e8046cd0-3b32-4065-ad78-4099a9bb2e35)]
+[scriptable,uuid(d6ab1d11-8e24-4db4-8582-c40a78281737)]
 interface nsIContentPolicyBase : nsISupports
 {
   /**
@@ -182,11 +182,6 @@ interface nsIContentPolicyBase : nsISupports
   const nsContentPolicyType TYPE_WEB_MANIFEST = 22;
 
   /**
-   * Indicates an save-as link download from the front-end code.
-   */
-  const nsContentPolicyType TYPE_SAVEAS_DOWNLOAD = 43;
-
-  /**
    * Indicates an internal constant for scripts loaded through script
    * elements.
    *
@@ -334,11 +329,17 @@ interface nsIContentPolicyBase : nsISupports
    */
   const nsContentPolicyType TYPE_INTERNAL_IMAGE_FAVICON = 41;
 
+  /**
+   * Indicates an save-as link download from the front-end code.
+   */
+  const nsContentPolicyType TYPE_SAVEAS_DOWNLOAD = 42;
+
   /* When adding new content types, please update nsContentBlocker,
-   * NS_CP_ContentTypeName, nsCSPContext, all nsIContentPolicy
-   * implementations, the static_assert in dom/cache/DBSchema.cpp,
-   * and other things that are not listed here that are related to
-   * nsIContentPolicy. */
+   * NS_CP_ContentTypeName, nsCSPContext, CSP_ContentTypeToDirective,
+   * DoContentSecurityChecks, all nsIContentPolicy implementations, the
+   * static_assert in dom/cache/DBSchema.cpp, nsPermissionManager.cpp,
+   * and other things that are not listed here that are related
+   * to nsIContentPolicy. */
 
   //////////////////////////////////////////////////////////////////////
 
diff --git a/dom/base/nsISimpleContentPolicy.idl b/dom/base/nsISimpleContentPolicy.idl
index ad1e3d897..dc0474736 100644
--- a/dom/base/nsISimpleContentPolicy.idl
+++ b/dom/base/nsISimpleContentPolicy.idl
@@ -28,7 +28,7 @@ interface nsIDOMElement;
  * by launching a dialog to prompt the user for something).
  */
 
-[scriptable,uuid(2215d135-df0d-445b-bb49-f11a4855f2a1)]
+[scriptable,uuid(1553a476-8a14-410b-8ecc-47f48e937392)]
 interface nsISimpleContentPolicy : nsIContentPolicyBase
 {
   /**
diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp
index 975fe8742..176e7b9d1 100644
--- a/dom/cache/DBSchema.cpp
+++ b/dom/cache/DBSchema.cpp
@@ -269,7 +269,6 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 &&
               nsIContentPolicy::TYPE_FETCH == 20 &&
               nsIContentPolicy::TYPE_IMAGESET == 21 &&
               nsIContentPolicy::TYPE_WEB_MANIFEST == 22 &&
-              nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 43 &&
               nsIContentPolicy::TYPE_INTERNAL_SCRIPT == 23 &&
               nsIContentPolicy::TYPE_INTERNAL_WORKER == 24 &&
               nsIContentPolicy::TYPE_INTERNAL_SHARED_WORKER == 25 &&
@@ -288,7 +287,8 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 &&
               nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD == 38 &&
               nsIContentPolicy::TYPE_INTERNAL_STYLESHEET == 39 &&
               nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD == 40 &&
-              nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON == 41,
+              nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON == 41 &&
+              nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 42,
               "nsContentPolicyType values are as expected");
 
 namespace {