Bug 1237152 - rename clear-origin-data to clear-origin-attributes-data, r=smaug
authorYoshi Huang <allstars.chh@mozilla.com>
Wed, 05 Oct 2016 17:58:25 +0800
changeset 316948 d6f37cd67e82f93925bb8e848a8087e7466918f0
parent 316947 a0f243dead30790a4d2ab082be4a3b6e5aa0eb01
child 316949 67f3ef959db7cb877a870af4746f1af25e6cb1ee
push id30790
push userryanvm@gmail.com
push dateSat, 08 Oct 2016 03:00:21 +0000
treeherdermozilla-central@a835589ae0c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1237152
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1237152 - rename clear-origin-data to clear-origin-attributes-data, r=smaug find \( -name '*.cpp' -o -name '*.h' -o -name '*.js' -o -name '*.jsm' -o -name '*.idl' -o -name '*.html' \) \ -a -type f -exec sed -i 's/clear-origin-data/clear-origin-attributes-data/g' {} \;
dom/apps/Webapps.jsm
dom/apps/tests/test_bug_1168300.html
dom/interfaces/apps/mozIApplicationClearPrivateDataParams.idl
dom/push/PushService.jsm
dom/quota/QuotaManagerService.cpp
dom/storage/DOMStorageObserver.cpp
dom/workers/ServiceWorkerManager.cpp
extensions/cookie/nsPermissionManager.cpp
extensions/cookie/nsPermissionManager.h
extensions/cookie/test/unit/test_permmanager_cleardata.js
layout/build/nsLayoutModule.cpp
netwerk/cache/nsApplicationCacheService.cpp
netwerk/cache2/CacheObserver.cpp
netwerk/protocol/http/nsHttpAuthCache.cpp
netwerk/test/unit/test_auth_jar.js
netwerk/test/unit/test_cache_jar.js
testing/specialpowers/content/SpecialPowersObserverAPI.js
toolkit/components/contextualidentity/ContextualIdentityService.jsm
toolkit/components/extensions/Extension.jsm
toolkit/components/thumbnails/BackgroundPageThumbs.jsm
--- a/dom/apps/Webapps.jsm
+++ b/dom/apps/Webapps.jsm
@@ -658,17 +658,17 @@ this.DOMApplicationRegistry = {
         return;
       }
 
       // b : core apps are not removable.
       for (let id in this.webapps) {
         if (id in data || this.webapps[id].removable)
           continue;
         // Remove the permissions, cookies and private data for this app.
-        // Both permission and cookie managers observe the "clear-origin-data"
+        // Both permission and cookie managers observe the "clear-origin-attributes-data"
         // event.
         let localId = this.webapps[id].localId;
         this._clearPrivateData(localId, false);
         delete this.webapps[id];
       }
 
       let appDir = FileUtils.getDir("coreAppsDir", ["webapps"], false);
       // c
@@ -4687,17 +4687,17 @@ this.DOMApplicationRegistry = {
     this._notifyCategoryAndObservers(subject, "webapps-clear-data", null, msg);
   },
 
   _clearOriginData: function(appId, browserOnly) {
     let attributes = {appId: appId};
     if (browserOnly) {
       attributes.inIsolatedMozBrowser = true;
     }
-    this._notifyCategoryAndObservers(null, "clear-origin-data", JSON.stringify(attributes));
+    this._notifyCategoryAndObservers(null, "clear-origin-attributes-data", JSON.stringify(attributes));
   }
 };
 
 /**
  * Appcache download observer
  */
 var AppcacheObserver = function(aApp) {
   debug("Creating AppcacheObserver for " + aApp.origin +
--- a/dom/apps/tests/test_bug_1168300.html
+++ b/dom/apps/tests/test_bug_1168300.html
@@ -47,17 +47,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     yield undefined;
 
     let request = navigator.mozApps.install(url);
     request.onerror = mozAppsError;
     request.onsuccess = continueTest;
     yield undefined;
     let app = request.result;
 
-    let _topic = "clear-origin-data";
+    let _topic = "clear-origin-attributes-data";
     let observer = new Observer(_topic);
     observer.onobserve = function(subject, topic, data, count) {
       ok(topic == _topic, "unknown topic " + topic);
 
       let props = Object.getOwnPropertyNames(JSON.parse(data));
       is(props.length, 1, "pattern should have one property");
       is(props[0], 'appId', "pattern property should be appId");
 
@@ -71,17 +71,17 @@ https://bugzilla.mozilla.org/show_bug.cg
       if (evt.application.manifestURL != url) {
         return;
       }
 
       ok(true, "got onuninstall event");
       continueTest();
     };
 
-    // we now wait for "clear-origin-data" notifications and onuninstall
+    // we now wait for "clear-origin-attributes-data" notifications and onuninstall
     // callback.
     yield undefined;
     yield undefined;
 
     navigator.mozApps.mgmt.onuninstall = null;
   }
 
   function Observer(topic) {
--- a/dom/interfaces/apps/mozIApplicationClearPrivateDataParams.idl
+++ b/dom/interfaces/apps/mozIApplicationClearPrivateDataParams.idl
@@ -11,10 +11,10 @@
 interface mozIApplicationClearPrivateDataParams : nsISupports
 {
   readonly attribute unsigned long appId;
   readonly attribute boolean browserOnly;
 };
 
 %{C++
 #define TOPIC_WEB_APP_CLEAR_DATA "webapps-clear-data"
-#define TOPIC_CLEAR_ORIGIN_DATA "clear-origin-data"
+#define TOPIC_CLEAR_ORIGIN_DATA "clear-origin-attributes-data"
 %}
--- a/dom/push/PushService.jsm
+++ b/dom/push/PushService.jsm
@@ -335,17 +335,17 @@ this.PushService = {
 
       case "perm-changed":
         this._onPermissionChange(aSubject, aData).catch(error => {
           console.error("onPermissionChange: Error updating registrations:",
             error);
         })
         break;
 
-      case "clear-origin-data":
+      case "clear-origin-attributes-data":
         this._clearOriginData(aData).catch(error => {
           console.error("clearOriginData: Error clearing origin data:", error);
         });
         break;
     }
   },
 
   _clearOriginData: function(data) {
@@ -512,17 +512,17 @@ this.PushService = {
 
   _startObservers: function() {
     console.debug("startObservers()");
 
     if (this._state != PUSH_SERVICE_ACTIVATING) {
       return;
     }
 
-    Services.obs.addObserver(this, "clear-origin-data", false);
+    Services.obs.addObserver(this, "clear-origin-attributes-data", false);
 
     // The offline-status-changed event is used to know
     // when to (dis)connect. It may not fire if the underlying OS changes
     // networks; in such a case we rely on timeout.
     Services.obs.addObserver(this, "network:offline-status-changed", false);
 
     // Used to monitor if the user wishes to disable Push.
     prefs.observe("connection.enabled", this);
@@ -606,17 +606,17 @@ this.PushService = {
 
     if (this._state < PUSH_SERVICE_ACTIVATING) {
       return;
     }
 
     prefs.ignore("connection.enabled", this);
 
     Services.obs.removeObserver(this, "network:offline-status-changed");
-    Services.obs.removeObserver(this, "clear-origin-data");
+    Services.obs.removeObserver(this, "clear-origin-attributes-data");
     Services.obs.removeObserver(this, "idle-daily");
     Services.obs.removeObserver(this, "perm-changed");
   },
 
   _shutdownService() {
     let promiseChangeURL = this._changeServerURL("", UNINIT_EVENT);
     this._setState(PUSH_SERVICE_UNINIT);
     console.debug("shutdownService: shutdown complete!");
--- a/dom/quota/QuotaManagerService.cpp
+++ b/dom/quota/QuotaManagerService.cpp
@@ -651,17 +651,17 @@ QuotaManagerService::Observe(nsISupports
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(NS_IsMainThread());
 
   if (!strcmp(aTopic, PROFILE_BEFORE_CHANGE_QM_OBSERVER_ID)) {
     RemoveIdleObserver();
     return NS_OK;
   }
 
-  if (!strcmp(aTopic, "clear-origin-data")) {
+  if (!strcmp(aTopic, "clear-origin-attributes-data")) {
     RefPtr<Request> request = new Request();
 
     ClearOriginsParams requestParams;
     requestParams.pattern() = nsDependentString(aData);
 
     nsAutoPtr<PendingRequestInfo> info(new RequestInfo(request, requestParams));
 
     nsresult rv = InitiateRequest(info);
--- a/dom/storage/DOMStorageObserver.cpp
+++ b/dom/storage/DOMStorageObserver.cpp
@@ -57,17 +57,17 @@ DOMStorageObserver::Init()
   NS_ADDREF(sSelf);
 
   // Chrome clear operations.
   obs->AddObserver(sSelf, kStartupTopic, true);
   obs->AddObserver(sSelf, "cookie-changed", true);
   obs->AddObserver(sSelf, "perm-changed", true);
   obs->AddObserver(sSelf, "browser:purge-domain-data", true);
   obs->AddObserver(sSelf, "last-pb-context-exited", true);
-  obs->AddObserver(sSelf, "clear-origin-data", true);
+  obs->AddObserver(sSelf, "clear-origin-attributes-data", true);
 
   // Shutdown
   obs->AddObserver(sSelf, "profile-after-change", true);
   obs->AddObserver(sSelf, "profile-before-change", true);
   obs->AddObserver(sSelf, "xpcom-shutdown", true);
 
   // Observe low device storage notifications.
   obs->AddObserver(sSelf, "disk-space-watcher", true);
@@ -261,17 +261,17 @@ DOMStorageObserver::Observe(nsISupports*
   // Clear all private-browsing caches
   if (!strcmp(aTopic, "last-pb-context-exited")) {
     Notify("private-browsing-data-cleared");
 
     return NS_OK;
   }
 
   // Clear data of the origins whose prefixes will match the suffix.
-  if (!strcmp(aTopic, "clear-origin-data")) {
+  if (!strcmp(aTopic, "clear-origin-attributes-data")) {
     OriginAttributesPattern pattern;
     if (!pattern.Init(nsDependentString(aData))) {
       NS_ERROR("Cannot parse origin attributes pattern");
       return NS_ERROR_FAILURE;
     }
 
     DOMStorageDBBridge* db = DOMStorageCache::StartDatabase();
     NS_ENSURE_TRUE(db, NS_ERROR_FAILURE);
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -89,17 +89,17 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::ipc;
 
 BEGIN_WORKERS_NAMESPACE
 
 #define PURGE_DOMAIN_DATA "browser:purge-domain-data"
 #define PURGE_SESSION_HISTORY "browser:purge-session-history"
-#define CLEAR_ORIGIN_DATA "clear-origin-data"
+#define CLEAR_ORIGIN_DATA "clear-origin-attributes-data"
 
 static_assert(nsIHttpChannelInternal::CORS_MODE_SAME_ORIGIN == static_cast<uint32_t>(RequestMode::Same_origin),
               "RequestMode enumeration value should match Necko CORS mode value.");
 static_assert(nsIHttpChannelInternal::CORS_MODE_NO_CORS == static_cast<uint32_t>(RequestMode::No_cors),
               "RequestMode enumeration value should match Necko CORS mode value.");
 static_assert(nsIHttpChannelInternal::CORS_MODE_CORS == static_cast<uint32_t>(RequestMode::Cors),
               "RequestMode enumeration value should match Necko CORS mode value.");
 static_assert(nsIHttpChannelInternal::CORS_MODE_NAVIGATE == static_cast<uint32_t>(RequestMode::Navigate),
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -199,17 +199,17 @@ class ClearOriginDataObserver final : pu
 
 public:
   NS_DECL_ISUPPORTS
 
   // nsIObserver implementation.
   NS_IMETHOD
   Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) override
   {
-    MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-data"));
+    MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-attributes-data"));
 
     nsCOMPtr<nsIPermissionManager> permManager = do_GetService("@mozilla.org/permissionmanager;1");
     return permManager->RemovePermissionsWithAttributes(nsDependentString(aData));
   }
 };
 
 NS_IMPL_ISUPPORTS(ClearOriginDataObserver, nsIObserver)
 
@@ -720,17 +720,17 @@ NS_IMETHODIMP DeleteFromMozHostListener:
   return NS_OK;
 }
 
 /* static */ void
 nsPermissionManager::ClearOriginDataObserverInit()
 {
   nsCOMPtr<nsIObserverService> observerService =
     mozilla::services::GetObserverService();
-  observerService->AddObserver(new ClearOriginDataObserver(), "clear-origin-data", /* ownsWeak= */ false);
+  observerService->AddObserver(new ClearOriginDataObserver(), "clear-origin-attributes-data", /* ownsWeak= */ false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsPermissionManager Implementation
 
 #define PERMISSIONS_FILE_NAME "permissions.sqlite"
 #define HOSTS_SCHEMA_VERSION 9
 
--- a/extensions/cookie/nsPermissionManager.h
+++ b/extensions/cookie/nsPermissionManager.h
@@ -192,17 +192,17 @@ public:
                        uint32_t aExpireType,
                        int64_t  aExpireTime,
                        int64_t aModificationTime,
                        NotifyOperationType aNotifyOperation,
                        DBOperationType aDBOperation,
                        const bool aIgnoreSessionPermissions = false);
 
   /**
-   * Initialize the "clear-origin-data" observing.
+   * Initialize the "clear-origin-attributes-data" observing.
    * Will create a nsPermissionManager instance if needed.
    * That way, we can prevent have nsPermissionManager created at startup just
    * to be able to clear data when an application is uninstalled.
    */
   static void ClearOriginDataObserverInit();
 
   nsresult
   RemovePermissionsWithAttributes(mozilla::OriginAttributesPattern& aAttrs);
--- a/extensions/cookie/test/unit/test_permmanager_cleardata.js
+++ b/extensions/cookie/test/unit/test_permmanager_cleardata.js
@@ -4,40 +4,40 @@
 var pm;
 
 // Create a principal based on the { origin, originAttributes }.
 function createPrincipal(aOrigin, aOriginAttributes)
 {
   return Services.scriptSecurityManager.createCodebasePrincipal(NetUtil.newURI(aOrigin), aOriginAttributes);
 }
 
-// Return the data required by 'clear-origin-data' notification.
+// Return the data required by 'clear-origin-attributes-data' notification.
 function getData(aPattern)
 {
   return JSON.stringify(aPattern);
 }
 
 // Use aEntries to create principals, add permissions to them and check that they have them.
-// Then, it is notifying 'clear-origin-data' with the given aData and check if the permissions
+// Then, it is notifying 'clear-origin-attributes-data' with the given aData and check if the permissions
 // of principals[i] matches the permission in aResults[i].
 function test(aEntries, aData, aResults)
 {
   let principals = [];
 
   for (entry of aEntries) {
     principals.push(createPrincipal(entry.origin, entry.originAttributes));
   }
 
   for (principal of principals) {
     do_check_eq(pm.testPermissionFromPrincipal(principal, "test/clear-origin"), pm.UNKNOWN_ACTION);
     pm.addFromPrincipal(principal, "test/clear-origin", pm.ALLOW_ACTION, pm.EXPIRE_NEVER, 0);
     do_check_eq(pm.testPermissionFromPrincipal(principal, "test/clear-origin"), pm.ALLOW_ACTION);
   }
 
-  Services.obs.notifyObservers(null, 'clear-origin-data', aData);
+  Services.obs.notifyObservers(null, 'clear-origin-attributes-data', aData);
 
   var length = aEntries.length;
   for (let i=0; i<length; ++i) {
     do_check_eq(pm.testPermissionFromPrincipal(principals[i], 'test/clear-origin'), aResults[i]);
 
     // Remove allowed actions.
     if (aResults[i] == pm.ALLOW_ACTION) {
       pm.removeFromPrincipal(principals[i], 'test/clear-origin');
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -1327,17 +1327,17 @@ static const mozilla::Module::CategoryEn
   { "content-policy", NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID, NS_DATADOCUMENTCONTENTPOLICY_CONTRACTID },
   { "content-policy", NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID, NS_NODATAPROTOCOLCONTENTPOLICY_CONTRACTID },
   { "content-policy", "CSPService", CSPSERVICE_CONTRACTID },
   { "content-policy", NS_MIXEDCONTENTBLOCKER_CONTRACTID, NS_MIXEDCONTENTBLOCKER_CONTRACTID },
   { "net-channel-event-sinks", "CSPService", CSPSERVICE_CONTRACTID },
   { "net-channel-event-sinks", NS_MIXEDCONTENTBLOCKER_CONTRACTID, NS_MIXEDCONTENTBLOCKER_CONTRACTID },
   { "app-startup", "Script Security Manager", "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID },
   { "app-startup", "Push Notifier", "service," PUSHNOTIFIER_CONTRACTID },
-  { "clear-origin-data", "QuotaManagerService", "service," QUOTAMANAGER_SERVICE_CONTRACTID },
+  { "clear-origin-attributes-data", "QuotaManagerService", "service," QUOTAMANAGER_SERVICE_CONTRACTID },
   { OBSERVER_TOPIC_IDLE_DAILY, "QuotaManagerService", QUOTAMANAGER_SERVICE_CONTRACTID },
 #ifdef MOZ_WIDGET_GONK
   { "app-startup", "Volume Service", "service," NS_VOLUMESERVICE_CONTRACTID },
 #endif
   CONTENTDLF_CATEGORIES
 #ifdef MOZ_WIDGET_GONK
   { "profile-after-change", "Gonk System Worker Manager", SYSTEMWORKERMANAGER_CONTRACTID },
 #endif
--- a/netwerk/cache/nsApplicationCacheService.cpp
+++ b/netwerk/cache/nsApplicationCacheService.cpp
@@ -184,17 +184,17 @@ nsApplicationCacheService::EvictMatching
         return NS_ERROR_UNEXPECTED;
 
     RefPtr<nsOfflineCacheDevice> device;
     nsresult rv = mCacheService->GetOfflineDevice(getter_AddRefs(device));
     NS_ENSURE_SUCCESS(rv, rv);
 
     mozilla::OriginAttributesPattern pattern;
     if (!pattern.Init(aPattern)) {
-        NS_ERROR("Could not parse OriginAttributesPattern JSON in clear-origin-data notification");
+        NS_ERROR("Could not parse OriginAttributesPattern JSON in clear-origin-attributes-data notification");
         return NS_ERROR_FAILURE;
     }
 
     return device->Evict(pattern);
 }
 
 NS_IMETHODIMP
 nsApplicationCacheService::GetGroups(uint32_t *count,
@@ -232,17 +232,17 @@ namespace {
 class AppCacheClearDataObserver final : public nsIObserver {
 public:
     NS_DECL_ISUPPORTS
 
     // nsIObserver implementation.
     NS_IMETHOD
     Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
     {
-        MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-data"));
+        MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-attributes-data"));
 
         nsresult rv;
 
         nsCOMPtr<nsIApplicationCacheService> cacheService =
             do_GetService(NS_APPLICATIONCACHESERVICE_CONTRACTID, &rv);
         NS_ENSURE_SUCCESS(rv, rv);
 
         return cacheService->EvictMatchingOriginAttributes(nsDependentString(aData));
@@ -258,11 +258,11 @@ NS_IMPL_ISUPPORTS(AppCacheClearDataObser
 
 // Instantiates and registers AppCacheClearDataObserver for notifications
 void
 nsApplicationCacheService::AppClearDataObserverInit()
 {
   nsCOMPtr<nsIObserverService> observerService = services::GetObserverService();
   if (observerService) {
     RefPtr<AppCacheClearDataObserver> obs = new AppCacheClearDataObserver();
-    observerService->AddObserver(obs, "clear-origin-data", /*ownsWeak=*/ false);
+    observerService->AddObserver(obs, "clear-origin-attributes-data", /*ownsWeak=*/ false);
   }
 }
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -124,17 +124,17 @@ CacheObserver::Init()
   NS_ADDREF(sSelf);
 
   obs->AddObserver(sSelf, "prefservice:after-app-defaults", true);
   obs->AddObserver(sSelf, "profile-do-change", true);
   obs->AddObserver(sSelf, "browser-delayed-startup-finished", true);
   obs->AddObserver(sSelf, "profile-before-change", true);
   obs->AddObserver(sSelf, "xpcom-shutdown", true);
   obs->AddObserver(sSelf, "last-pb-context-exited", true);
-  obs->AddObserver(sSelf, "clear-origin-data", true);
+  obs->AddObserver(sSelf, "clear-origin-attributes-data", true);
   obs->AddObserver(sSelf, "memory-pressure", true);
 
   return NS_OK;
 }
 
 // static
 nsresult
 CacheObserver::Shutdown()
@@ -547,20 +547,20 @@ CacheObserver::Observe(nsISupports* aSub
     RefPtr<CacheStorageService> service = CacheStorageService::Self();
     if (service) {
       service->DropPrivateBrowsingEntries();
     }
 
     return NS_OK;
   }
 
-  if (!strcmp(aTopic, "clear-origin-data")) {
+  if (!strcmp(aTopic, "clear-origin-attributes-data")) {
     NeckoOriginAttributes oa;
     if (!oa.Init(nsDependentString(aData))) {
-      NS_ERROR("Could not parse NeckoOriginAttributes JSON in clear-origin-data notification");
+      NS_ERROR("Could not parse NeckoOriginAttributes JSON in clear-origin-attributes-data notification");
       return NS_OK;
     }
 
     nsresult rv = CacheStorageEvictHelper::Run(oa);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return NS_OK;
   }
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp
+++ b/netwerk/protocol/http/nsHttpAuthCache.cpp
@@ -55,27 +55,27 @@ StrEquivalent(const char16_t *a, const c
 //-----------------------------------------------------------------------------
 
 nsHttpAuthCache::nsHttpAuthCache()
     : mDB(nullptr)
     , mObserver(new OriginClearObserver(this))
 {
     nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
     if (obsSvc) {
-        obsSvc->AddObserver(mObserver, "clear-origin-data", false);
+        obsSvc->AddObserver(mObserver, "clear-origin-attributes-data", false);
     }
 }
 
 nsHttpAuthCache::~nsHttpAuthCache()
 {
     if (mDB)
         ClearAll();
     nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
     if (obsSvc) {
-        obsSvc->RemoveObserver(mObserver, "clear-origin-data");
+        obsSvc->RemoveObserver(mObserver, "clear-origin-attributes-data");
         mObserver->mOwner = nullptr;
     }
 }
 
 nsresult
 nsHttpAuthCache::Init()
 {
     NS_ENSURE_TRUE(!mDB, NS_ERROR_ALREADY_INITIALIZED);
--- a/netwerk/test/unit/test_auth_jar.js
+++ b/netwerk/test/unit/test_auth_jar.js
@@ -19,17 +19,17 @@ function run_test() {
 
   var am = Cc["@mozilla.org/network/http-auth-manager;1"].
            getService(Ci.nsIHttpAuthManager);
   am.setAuthIdentity("http", "a.example.com", -1, "basic", "realm", "", "example.com", "user", "pass", false, app1);
   am.setAuthIdentity("http", "a.example.com", -1, "basic", "realm", "", "example.com", "user3", "pass3", false, app1browser);
   am.setAuthIdentity("http", "a.example.com", -1, "basic", "realm", "", "example.com", "user2", "pass2", false, app10);
 
   let attrs_inBrowser = JSON.stringify({ appId:1, inIsolatedMozBrowser:true });
-  Services.obs.notifyObservers(null, "clear-origin-data", attrs_inBrowser);
+  Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs_inBrowser);
   
   var domain = {value: ""}, user = {value: ""}, pass = {value: ""};
   try {
     am.getAuthIdentity("http", "a.example.com", -1, "basic", "realm", "", domain, user, pass, false, app1browser);
     do_check_false(true); // no identity should be present
   } catch (x) {
     do_check_eq(domain.value, "");
     do_check_eq(user.value, "");
--- a/netwerk/test/unit/test_cache_jar.js
+++ b/netwerk/test/unit/test_cache_jar.js
@@ -59,37 +59,37 @@ function run_all_tests() {
   // the rest of these tests.
   let procType = Cc["@mozilla.org/xre/runtime;1"].getService(Ci.nsIXULRuntime).processType;
   if (procType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT)
     return;
 
   let attrs_inBrowser = JSON.stringify({ appId:1, inIsolatedMozBrowser:true });
   let attrs_notInBrowser = JSON.stringify({ appId:1 });
 
-  Services.obs.notifyObservers(null, "clear-origin-data", attrs_inBrowser);
+  Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs_inBrowser);
 
   for (let test of secondTests) {
     handlers_called = 0;
     var chan = makeChan(URL, test[0], test[1], test[2]);
     chan.asyncOpen2(new ChannelListener(doneFirstLoad, test[3]));
     yield undefined;
   }
 
-  Services.obs.notifyObservers(null, "clear-origin-data", attrs_notInBrowser);
-  Services.obs.notifyObservers(null, "clear-origin-data", attrs_inBrowser);
+  Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs_notInBrowser);
+  Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs_inBrowser);
 
   for (let test of thirdTests) {
     handlers_called = 0;
     var chan = makeChan(URL, test[0], test[1], test[2]);
     chan.asyncOpen2(new ChannelListener(doneFirstLoad, test[3]));
     yield undefined;
   }
 
   let attrs_userContextId = JSON.stringify({ userContextId: 1 });
-  Services.obs.notifyObservers(null, "clear-origin-data", attrs_userContextId);
+  Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs_userContextId);
 
   for (let test of fourthTests) {
     handlers_called = 0;
     var chan = makeChan(URL, test[0], test[1], test[2]);
     chan.asyncOpen2(new ChannelListener(doneFirstLoad, test[3]));
     yield undefined;
   }
 }
--- a/testing/specialpowers/content/SpecialPowersObserverAPI.js
+++ b/testing/specialpowers/content/SpecialPowersObserverAPI.js
@@ -656,17 +656,17 @@ SpecialPowersObserverAPI.prototype = {
         let appId = aMessage.data.appId;
         let browserOnly = aMessage.data.browserOnly;
 
         let attributes = { appId: appId };
         if (browserOnly) {
           attributes.inIsolatedMozBrowser = true;
         }
         this._notifyCategoryAndObservers(null,
-                                         "clear-origin-data",
+                                         "clear-origin-attributes-data",
                                          JSON.stringify(attributes));
 
         let subject = {
           appId: appId,
           browserOnly: browserOnly,
           QueryInterface: XPCOMUtils.generateQI([Ci.mozIApplicationClearPrivateDataParams])
         };
         this._notifyCategoryAndObservers(subject, "webapps-clear-data", null);
--- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm
+++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
@@ -193,17 +193,17 @@ function _ContextualIdentityService(path
   },
 
   remove(userContextId) {
     let index = this._identities.findIndex(i => i.userContextId == userContextId && i.public);
     if (index == -1) {
       return false;
     }
 
-    Services.obs.notifyObservers(null, "clear-origin-data",
+    Services.obs.notifyObservers(null, "clear-origin-attributes-data",
                                  JSON.stringify({ userContextId }));
 
     this._identities.splice(index, 1);
     this._openedIdentities.delete(userContextId);
     this.saveSoon();
 
     return true;
   },
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -622,17 +622,17 @@ var UninstallObserver = {
       let baseURI = NetUtil.newURI(`moz-extension://${uuid}/`);
       let principal = Services.scriptSecurityManager.createCodebasePrincipal(
         baseURI, {addonId: addon.id}
       );
       Services.qms.clearStoragesForPrincipal(principal);
 
       // Clear localStorage created by the extension
       let attrs = JSON.stringify({addonId: addon.id});
-      Services.obs.notifyObservers(null, "clear-origin-data", attrs);
+      Services.obs.notifyObservers(null, "clear-origin-attributes-data", attrs);
     }
 
     if (!this.leaveUuid) {
       // Clear the entry in the UUID map
       UUIDMap.remove(addon.id);
     }
   },
 };
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -433,17 +433,17 @@ Capture.prototype = {
         catch (err) {
           Cu.reportError(err);
         }
       }
 
       // Clear the data in the private container for thumbnails.
       let privateIdentity =
         ContextualIdentityService.getPrivateIdentity("userContextIdInternal.thumbnail");
-      Services.obs.notifyObservers(null, "clear-origin-data",
+      Services.obs.notifyObservers(null, "clear-origin-attributes-data",
           JSON.stringify({ userContextId: privateIdentity.userContextId }));
     };
 
     if (!data) {
       done();
       return;
     }