Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e28540fe266a (bug 1246828) for xpcshell failures in test_TelemetrySession.js CLOSED TREE

Browse Source 
--HG--
extra : commitid : 8sSr108Ob73
This commit is contained in:
Wes Kocher 2016-02-10 13:40:41 -08:00
parent 17f323d482
commit b899130873
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/quota/ActorsParent.cpp
View File

@ -89,8 +89,8 @@
// Preference that is used to enable testing features
#define PREF_TESTING_FEATURES "dom.quotaManager.testing"
// profile-before-change2, when we need to shut down quota manager
#define PROFILE_BEFORE_CHANGE2_OBSERVER_ID "profile-before-change2"
// profile-before-change, when we need to shut down quota manager
#define PROFILE_BEFORE_CHANGE_OBSERVER_ID "profile-before-change"
// The name of the file that we use to load/save the last access time of an
// origin.
@ -2180,7 +2180,7 @@ CreateRunnable::RegisterObserver()
nsCOMPtr<nsIObserver> observer = new ShutdownObserver(mOwningThread);
nsresult rv = observerService->AddObserver(observer,
PROFILE_BEFORE_CHANGE2_OBSERVER_ID,
PROFILE_BEFORE_CHANGE_OBSERVER_ID,
false);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@ -2329,7 +2329,7 @@ ShutdownObserver::Observe(nsISupports* aSubject,
const char16_t* aData)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!strcmp(aTopic, PROFILE_BEFORE_CHANGE2_OBSERVER_ID));
MOZ_ASSERT(!strcmp(aTopic, PROFILE_BEFORE_CHANGE_OBSERVER_ID));
bool done = false;

6
dom/quota/QuotaManagerService.cpp
View File

@ -25,7 +25,7 @@
#include "QuotaManager.h"
#include "QuotaRequests.h"
#define PROFILE_BEFORE_CHANGE2_OBSERVER_ID "profile-before-change2"
#define PROFILE_BEFORE_CHANGE_OBSERVER_ID "profile-before-change"
namespace mozilla {
namespace dom {
@ -296,7 +296,7 @@ QuotaManagerService::Init()
}
nsresult rv = observerService->AddObserver(this,
PROFILE_BEFORE_CHANGE2_OBSERVER_ID,
PROFILE_BEFORE_CHANGE_OBSERVER_ID,
false);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@ -638,7 +638,7 @@ QuotaManagerService::Observe(nsISupports* aSubject,
MOZ_ASSERT(XRE_IsParentProcess());
MOZ_ASSERT(NS_IsMainThread());
if (!strcmp(aTopic, PROFILE_BEFORE_CHANGE2_OBSERVER_ID)) {
if (!strcmp(aTopic, PROFILE_BEFORE_CHANGE_OBSERVER_ID)) {
RemoveIdleObserver();
return NS_OK;
}

1
testing/xpcshell/head.js
View File

@ -614,7 +614,6 @@ function _execute_test() {
obs.notifyObservers(null, "profile-change-net-teardown", null);
obs.notifyObservers(null, "profile-change-teardown", null);
obs.notifyObservers(null, "profile-before-change", null);
obs.notifyObservers(null, "profile-before-change2", null);
_profileInitialized = false;
}