Bug 1584986 - P2 - Rename listInitializedOrigins to listOrigins; r=asuth,johannh

Differential Revision: https://phabricator.services.mozilla.com/D47741

--HG--
rename : dom/quota/test/unit/test_listInitializedOrigins.js => dom/quota/test/unit/test_listOrigins.js
extra : moz-landing-system : lando

browser/modules/Sanitizer.jsm

@@ -769,8 +769,8 @@ class PrincipalsCollector {
   async getAllPrincipalsInternal(progress) {
     progress.step = "principals-quota-manager";
     let principals = await new Promise(resolve => {
-      quotaManagerService.listInitializedOrigins(request => {
-        progress.step = "principals-quota-manager-listInitializedOrigins";
+      quotaManagerService.listOrigins(request => {
+        progress.step = "principals-quota-manager-listOrigins";
         if (request.resultCode != Cr.NS_OK) {
           // We are probably shutting down. We don't want to propagate the
           // error, rejecting the promise.

dom/quota/ActorsChild.cpp

@@ -285,21 +285,16 @@ void QuotaRequestChild::HandleResponse(const nsTArray<nsCString>& aResponse) {
   if (aResponse.IsEmpty()) {
     variant->SetAsEmptyArray();
   } else {
-    nsTArray<RefPtr<InitializedOriginsResult>> initializedOriginsResults(
-        aResponse.Length());
+    nsTArray<RefPtr<OriginsResult>> originsResults(aResponse.Length());
     for (auto& origin : aResponse) {
-      RefPtr<InitializedOriginsResult> initializedOriginsResult =
-          new InitializedOriginsResult(origin);
+      RefPtr<OriginsResult> originsResult = new OriginsResult(origin);
 
-      initializedOriginsResults.AppendElement(
-          initializedOriginsResult.forget());
+      originsResults.AppendElement(originsResult.forget());
     }
 
     variant->SetAsArray(
-        nsIDataType::VTYPE_INTERFACE_IS,
-        &NS_GET_IID(nsIQuotaInitializedOriginsResult),
-        initializedOriginsResults.Length(),
-        static_cast<void*>(initializedOriginsResults.Elements()));
+        nsIDataType::VTYPE_INTERFACE_IS, &NS_GET_IID(nsIQuotaOriginsResult),
+        originsResults.Length(), static_cast<void*>(originsResults.Elements()));
   }
 
   mRequest->SetResult(variant);
@@ -342,8 +337,8 @@ mozilla::ipc::IPCResult QuotaRequestChild::Recv__delete__(
       HandleResponse(aResponse.get_EstimateResponse());
       break;
 
-    case RequestResponse::TListInitializedOriginsResponse:
-      HandleResponse(aResponse.get_ListInitializedOriginsResponse().origins());
+    case RequestResponse::TListOriginsResponse:
+      HandleResponse(aResponse.get_ListOriginsResponse().origins());
       break;
 
     default:

dom/quota/ActorsParent.cpp

@@ -1588,18 +1588,18 @@ class EstimateOp final : public QuotaRequestBase {
   void GetResponse(RequestResponse& aResponse) override;
 };
 
-class ListInitializedOriginsOp final : public QuotaRequestBase,
-                                       public TraverseRepositoryHelper {
+class ListOriginsOp final : public QuotaRequestBase,
+                            public TraverseRepositoryHelper {
   // XXX Bug 1521541 will make each origin has it's own state.
   nsTArray<nsCString> mOrigins;
 
  public:
-  ListInitializedOriginsOp();
+  ListOriginsOp();
 
   bool Init(Quota* aQuota) override;
 
  private:
-  ~ListInitializedOriginsOp() = default;
+  ~ListOriginsOp() = default;
 
   nsresult DoDirectoryWork(QuotaManager* aQuotaManager) override;
 
@@ -8288,7 +8288,7 @@ bool Quota::VerifyRequestParams(const RequestParams& aParams) const {
 
     case RequestParams::TClearAllParams:
     case RequestParams::TResetAllParams:
-    case RequestParams::TListInitializedOriginsParams:
+    case RequestParams::TListOriginsParams:
       break;
 
     case RequestParams::TPersistedParams: {
@@ -8467,8 +8467,8 @@ PQuotaRequestParent* Quota::AllocPQuotaRequestParent(
       actor = new EstimateOp(aParams);
       break;
 
-    case RequestParams::TListInitializedOriginsParams:
-      actor = new ListInitializedOriginsOp();
+    case RequestParams::TListOriginsParams:
+      actor = new ListOriginsOp();
       break;
 
     default:
@@ -9773,12 +9773,12 @@ void EstimateOp::GetResponse(RequestResponse& aResponse) {
   aResponse = estimateResponse;
 }
 
-ListInitializedOriginsOp::ListInitializedOriginsOp()
+ListOriginsOp::ListOriginsOp()
     : QuotaRequestBase(/* aExclusive */ false), TraverseRepositoryHelper() {
   AssertIsOnOwningThread();
 }
 
-bool ListInitializedOriginsOp::Init(Quota* aQuota) {
+bool ListOriginsOp::Init(Quota* aQuota) {
   AssertIsOnOwningThread();
   MOZ_ASSERT(aQuota);
 
@@ -9787,12 +9787,11 @@ bool ListInitializedOriginsOp::Init(Quota* aQuota) {
   return true;
 }
 
-nsresult ListInitializedOriginsOp::DoDirectoryWork(
-    QuotaManager* aQuotaManager) {
+nsresult ListOriginsOp::DoDirectoryWork(QuotaManager* aQuotaManager) {
   AssertIsOnIOThread();
   MOZ_ASSERT(aQuotaManager);
 
-  AUTO_PROFILER_LABEL("ListInitializedOriginsOp::DoDirectoryWork", OTHER);
+  AUTO_PROFILER_LABEL("ListOriginsOp::DoDirectoryWork", OTHER);
 
   nsresult rv;
 
@@ -9814,15 +9813,16 @@ nsresult ListInitializedOriginsOp::DoDirectoryWork(
   return NS_OK;
 }
 
-bool ListInitializedOriginsOp::IsCanceled() {
+bool ListOriginsOp::IsCanceled() {
   AssertIsOnIOThread();
 
   return mCanceled;
 }
 
-nsresult ListInitializedOriginsOp::ProcessOrigin(
-    QuotaManager* aQuotaManager, nsIFile* aOriginDir, const bool aPersistent,
-    const PersistenceType aPersistenceType) {
+nsresult ListOriginsOp::ProcessOrigin(QuotaManager* aQuotaManager,
+                                      nsIFile* aOriginDir,
+                                      const bool aPersistent,
+                                      const PersistenceType aPersistenceType) {
   AssertIsOnIOThread();
   MOZ_ASSERT(aQuotaManager);
   MOZ_ASSERT(aOriginDir);
@@ -9847,16 +9847,15 @@ nsresult ListInitializedOriginsOp::ProcessOrigin(
   return NS_OK;
 }
 
-void ListInitializedOriginsOp::GetResponse(RequestResponse& aResponse) {
+void ListOriginsOp::GetResponse(RequestResponse& aResponse) {
   AssertIsOnOwningThread();
 
-  aResponse = ListInitializedOriginsResponse();
+  aResponse = ListOriginsResponse();
   if (mOrigins.IsEmpty()) {
     return;
   }
 
-  nsTArray<nsCString>& origins =
-      aResponse.get_ListInitializedOriginsResponse().origins();
+  nsTArray<nsCString>& origins = aResponse.get_ListOriginsResponse().origins();
   mOrigins.SwapElements(origins);
 }
 

dom/quota/PQuota.ipdl

@@ -105,7 +105,7 @@ struct EstimateParams
   PrincipalInfo principalInfo;
 };
 
-struct ListInitializedOriginsParams
+struct ListOriginsParams
 {
 };
 
@@ -122,7 +122,7 @@ union RequestParams
   PersistedParams;
   PersistParams;
   EstimateParams;
-  ListInitializedOriginsParams;
+  ListOriginsParams;
 };
 
 protocol PQuota

dom/quota/PQuotaRequest.ipdl

@@ -56,7 +56,7 @@ struct EstimateResponse
   uint64_t limit;
 };
 
-struct ListInitializedOriginsResponse
+struct ListOriginsResponse
 {
   nsCString[] origins;
 };
@@ -75,7 +75,7 @@ union RequestResponse
   PersistedResponse;
   PersistResponse;
   EstimateResponse;
-  ListInitializedOriginsResponse;
+  ListOriginsResponse;
 };
 
 protocol PQuotaRequest

dom/quota/QuotaManagerService.cpp

@@ -768,14 +768,14 @@ QuotaManagerService::Estimate(nsIPrincipal* aPrincipal,
 }
 
 NS_IMETHODIMP
-QuotaManagerService::ListInitializedOrigins(nsIQuotaCallback* aCallback,
-                                            nsIQuotaRequest** _retval) {
+QuotaManagerService::ListOrigins(nsIQuotaCallback* aCallback,
+                                 nsIQuotaRequest** _retval) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aCallback);
 
   RefPtr<Request> request = new Request(aCallback);
 
-  ListInitializedOriginsParams params;
+  ListOriginsParams params;
 
   nsAutoPtr<PendingRequestInfo> info(new RequestInfo(request, params));
 

dom/quota/QuotaResults.cpp

@@ -91,13 +91,12 @@ EstimateResult::GetLimit(uint64_t* aLimit) {
   return NS_OK;
 }
 
-InitializedOriginsResult::InitializedOriginsResult(const nsACString& aOrigin)
-    : mOrigin(aOrigin) {}
+OriginsResult::OriginsResult(const nsACString& aOrigin) : mOrigin(aOrigin) {}
 
-NS_IMPL_ISUPPORTS(InitializedOriginsResult, nsIQuotaInitializedOriginsResult)
+NS_IMPL_ISUPPORTS(OriginsResult, nsIQuotaOriginsResult)
 
 NS_IMETHODIMP
-InitializedOriginsResult::GetOrigin(nsACString& aOrigin) {
+OriginsResult::GetOrigin(nsACString& aOrigin) {
   aOrigin = mOrigin;
   return NS_OK;
 }

dom/quota/QuotaResults.h

@@ -58,17 +58,17 @@ class EstimateResult : public nsIQuotaEstimateResult {
   NS_DECL_NSIQUOTAESTIMATERESULT
 };
 
-class InitializedOriginsResult : public nsIQuotaInitializedOriginsResult {
+class OriginsResult : public nsIQuotaOriginsResult {
   nsCString mOrigin;
 
  public:
-  explicit InitializedOriginsResult(const nsACString& aOrigin);
+  explicit OriginsResult(const nsACString& aOrigin);
 
  private:
-  virtual ~InitializedOriginsResult() = default;
+  virtual ~OriginsResult() = default;
 
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIQUOTAINITIALIZEDORIGINSRESULT
+  NS_DECL_NSIQUOTAORIGINSRESULT
 };
 
 }  // namespace quota

dom/quota/nsIQuotaManagerService.idl

@@ -90,13 +90,13 @@ interface nsIQuotaManagerService : nsISupports
 
   /**
    * Schedules an asynchronous callback that will inspect all origins and
-   * just returns the origin strings of initialized origins.
+   * just returns the origin strings of origins.
    *
    * @param aCallback
    *        The callback that will be called when the origin is collected.
    */
   [must_use] nsIQuotaRequest
-  listInitializedOrigins(in nsIQuotaCallback aCallback);
+  listOrigins(in nsIQuotaCallback aCallback);
 
   /**
    * Removes all storages. The files may not be deleted immediately depending

dom/quota/nsIQuotaRequests.idl

@@ -39,7 +39,7 @@ interface nsIQuotaRequest : nsIQuotaRequestBase
   // The result can contain one of these types:
   //   void
   //   bool
-  //   array of nsIQuotaInitializedOriginsResult
+  //   array of nsIQuotaOriginsResult
   [must_use] readonly attribute nsIVariant result;
 
   attribute nsIQuotaCallback callback;

dom/quota/nsIQuotaResults.idl

@@ -35,7 +35,7 @@ interface nsIQuotaEstimateResult : nsISupports
 };
 
 [scriptable, function, uuid(5d8c2fbe-9ccc-4bab-8f03-8591dfc8e351)]
-interface nsIQuotaInitializedOriginsResult : nsISupports
+interface nsIQuotaOriginsResult : nsISupports
 {
   readonly attribute ACString origin;
 };

dom/quota/test/unit/xpcshell.ini

@@ -38,7 +38,7 @@ support-files =
 [test_groupMismatch.js]
 [test_idbSubdirUpgrade.js]
 [test_initTemporaryStorage.js]
-[test_listInitializedOrigins.js]
+[test_listOrigins.js]
 [test_localStorageArchive1upgrade.js]
 [test_localStorageArchive4upgrade.js]
 [test_localStorageArchiveDowngrade.js]

toolkit/components/cleardata/ClearDataService.jsm

@@ -514,7 +514,7 @@ const QuotaCleaner = {
           // wiped if we are provided an aHost of "example.com".
           promises.push(
             new Promise((aResolve, aReject) => {
-              Services.qms.listInitializedOrigins(aRequest => {
+              Services.qms.listOrigins(aRequest => {
                 if (aRequest.resultCode != Cr.NS_OK) {
                   aReject({ message: "Delete by host failed" });
                   return;