Backed out changeset a70b549ac35d (bug 1347817) for failing test_webs…

…ocket-transport.html on OSX 10.10 debug. r=backout
dothq · Mar 29, 2017 · 65459a7 · 65459a7
1 parent 2d288e1
commit 65459a7
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp
@@ -55,7 +55,7 @@ BasePrincipal::GetOriginNoSuffix(nsACString& aOrigin)
   if (mOriginNoSuffix) {
     return mOriginNoSuffix->ToUTF8String(aOrigin);
   }
-  return GetOriginNoSuffixInternal(aOrigin);
+  return GetOriginInternal(aOrigin);
 }
 
 bool
@@ -465,10 +465,10 @@ BasePrincipal::FinishInit()
 
   // Then compute the origin without the suffix.
   nsAutoCString originNoSuffix;
-  nsresult rv = GetOriginNoSuffixInternal(originNoSuffix);
+  nsresult rv = GetOriginInternal(originNoSuffix);
   if (NS_FAILED(rv)) {
-    // If GetOriginNoSuffixInternal fails, we will get a null atom for
-    // mOriginNoSuffix, which we deal with anywhere mOriginNoSuffix is used.
+    // If GetOriginInternal fails, we will get a null atom for mOriginNoSuffix,
+    // which we deal with anywhere mOriginNoSuffix is used.
     // Once this is made infallible we can remove those null checks.
     mOriginNoSuffix = nullptr;
     return;

diff --git a/caps/BasePrincipal.h b/caps/BasePrincipal.h
@@ -104,7 +104,7 @@ class BasePrincipal : public nsJSPrincipals
 protected:
   virtual ~BasePrincipal();
 
-  virtual nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) = 0;
+  virtual nsresult GetOriginInternal(nsACString& aOrigin) = 0;
   // Note that this does not check OriginAttributes. Callers that depend on
   // those must call Subsumes instead.
   virtual bool SubsumesInternal(nsIPrincipal* aOther, DocumentDomainConsideration aConsider) = 0;

diff --git a/caps/ContentPrincipal.cpp b/caps/ContentPrincipal.cpp
@@ -132,7 +132,7 @@ ContentPrincipal::GetScriptLocation(nsACString &aStr)
 }
 
 nsresult
-ContentPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
+ContentPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
   if (!mCodebase) {
     return NS_ERROR_FAILURE;

diff --git a/caps/ContentPrincipal.h b/caps/ContentPrincipal.h
@@ -27,7 +27,7 @@ class ContentPrincipal final : public mozilla::BasePrincipal
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
   bool IsCodebasePrincipal() const override { return true; }
-  nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
 
   ContentPrincipal();
 

diff --git a/caps/ExpandedPrincipal.cpp b/caps/ExpandedPrincipal.cpp
@@ -82,7 +82,7 @@ ExpandedPrincipal::SetDomain(nsIURI* aDomain)
 }
 
 nsresult
-ExpandedPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
+ExpandedPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
   aOrigin.AssignLiteral("[Expanded Principal [");
   for (size_t i = 0; i < mPrincipals.Length(); ++i) {

diff --git a/caps/ExpandedPrincipal.h b/caps/ExpandedPrincipal.h
@@ -37,7 +37,7 @@ class ExpandedPrincipal : public nsIExpandedPrincipal
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
   virtual bool AddonHasPermission(const nsAString& aPerm) override;
   virtual nsresult GetScriptLocation(nsACString &aStr) override;
-  nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
 
 protected:
   virtual ~ExpandedPrincipal();

diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp
@@ -144,7 +144,7 @@ NullPrincipal::SetDomain(nsIURI* aDomain)
 }
 
 nsresult
-NullPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
+NullPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
   return mURI->GetSpec(aOrigin);
 }

diff --git a/caps/NullPrincipal.h b/caps/NullPrincipal.h
@@ -51,7 +51,7 @@ class NullPrincipal final : public mozilla::BasePrincipal
   NS_IMETHOD SetDomain(nsIURI* aDomain) override;
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
-  nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
 
   static already_AddRefed<NullPrincipal> CreateWithInheritedAttributes(nsIPrincipal* aInheritFrom);
 

diff --git a/caps/SystemPrincipal.cpp b/caps/SystemPrincipal.cpp
@@ -65,7 +65,7 @@ SystemPrincipal::GetURI(nsIURI** aURI)
 }
 
 nsresult
-SystemPrincipal::GetOriginNoSuffixInternal(nsACString& aOrigin)
+SystemPrincipal::GetOriginInternal(nsACString& aOrigin)
 {
     aOrigin.AssignLiteral(SYSTEM_PRINCIPAL_SPEC);
     return NS_OK;

diff --git a/caps/SystemPrincipal.h b/caps/SystemPrincipal.h
@@ -43,7 +43,7 @@ class SystemPrincipal final : public mozilla::BasePrincipal
   NS_IMETHOD EnsurePreloadCSP(nsIDOMDocument* aDocument, nsIContentSecurityPolicy** aCSP) override;
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
-  nsresult GetOriginNoSuffixInternal(nsACString& aOrigin) override;
+  nsresult GetOriginInternal(nsACString& aOrigin) override;
 
   virtual nsresult GetScriptLocation(nsACString &aStr) override;