From eb434ae2fb8001d0004a7a547b9e0f045a93dc77 Mon Sep 17 00:00:00 2001 From: Mike Conley Date: Mon, 2 Nov 2015 20:57:03 -0500 Subject: [PATCH] Bug 1220929 - Rename TabCrashReporter to TabCrashHandler to reflect its actual purpose. r=felipe --- browser/base/content/browser.js | 6 +++--- .../base/content/test/general/browser_aboutTabCrashed.js | 2 +- .../test/general/browser_aboutTabCrashed_clearEmail.js | 2 +- browser/base/content/test/general/head.js | 4 ++-- browser/components/nsBrowserGlue.js | 8 ++++---- ...ContentCrashReporters.jsm => ContentCrashHandlers.jsm} | 4 ++-- browser/modules/moz.build | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) rename browser/modules/{ContentCrashReporters.jsm => ContentCrashHandlers.jsm} (99%) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 7b6c9986b3e..5fb314ce41d 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -230,11 +230,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", XPCOMUtils.defineLazyModuleGetter(this, "gWebRTCUI", "resource:///modules/webrtcUI.jsm", "webrtcUI"); -XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter", - "resource:///modules/ContentCrashReporters.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler", + "resource:///modules/ContentCrashHandlers.jsm"); #ifdef MOZ_CRASHREPORTER XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter", - "resource:///modules/ContentCrashReporters.jsm"); + "resource:///modules/ContentCrashHandlers.jsm"); #endif XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler", diff --git a/browser/base/content/test/general/browser_aboutTabCrashed.js b/browser/base/content/test/general/browser_aboutTabCrashed.js index 638f830c841..fa7e2edde1a 100644 --- a/browser/base/content/test/general/browser_aboutTabCrashed.js +++ b/browser/base/content/test/general/browser_aboutTabCrashed.js @@ -70,7 +70,7 @@ function crashTabTestHelper(fieldValues, expectedExtra) { gBrowser, url: PAGE, }, function*(browser) { - let prefs = TabCrashReporter.prefs; + let prefs = TabCrashHandler.prefs; let originalSendReport = prefs.getBoolPref("sendReport"); let originalEmailMe = prefs.getBoolPref("emailMe"); let originalIncludeURL = prefs.getBoolPref("includeURL"); diff --git a/browser/base/content/test/general/browser_aboutTabCrashed_clearEmail.js b/browser/base/content/test/general/browser_aboutTabCrashed_clearEmail.js index 65806040aad..c1e3c544034 100644 --- a/browser/base/content/test/general/browser_aboutTabCrashed_clearEmail.js +++ b/browser/base/content/test/general/browser_aboutTabCrashed_clearEmail.js @@ -37,7 +37,7 @@ add_task(function* test_clear_email() { gBrowser, url: PAGE, }, function*(browser) { - let prefs = TabCrashReporter.prefs; + let prefs = TabCrashHandler.prefs; let originalSendReport = prefs.getBoolPref("sendReport"); let originalEmailMe = prefs.getBoolPref("emailMe"); let originalIncludeURL = prefs.getBoolPref("includeURL"); diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js index fba28a24011..2f20399e19a 100644 --- a/browser/base/content/test/general/head.js +++ b/browser/base/content/test/general/head.js @@ -8,8 +8,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils", "resource://testing-common/PlacesTestUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter", - "resource:///modules/ContentCrashReporters.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler", + "resource:///modules/ContentCrashHandlers.jsm"); /** * Wait for a to be closed then call the specified callback. diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 1927412fdac..ee8828f5602 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -142,11 +142,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"); #endif -XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter", - "resource:///modules/ContentCrashReporters.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler", + "resource:///modules/ContentCrashHandlers.jsm"); #ifdef MOZ_CRASHREPORTER XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter", - "resource:///modules/ContentCrashReporters.jsm"); + "resource:///modules/ContentCrashHandlers.jsm"); #endif XPCOMUtils.defineLazyGetter(this, "ShellService", function() { @@ -890,7 +890,7 @@ BrowserGlue.prototype = { }); #endif - TabCrashReporter.init(); + TabCrashHandler.init(); #ifdef MOZ_CRASHREPORTER PluginCrashReporter.init(); #endif diff --git a/browser/modules/ContentCrashReporters.jsm b/browser/modules/ContentCrashHandlers.jsm similarity index 99% rename from browser/modules/ContentCrashReporters.jsm rename to browser/modules/ContentCrashHandlers.jsm index ca683d97a50..336dc8ff2c4 100644 --- a/browser/modules/ContentCrashReporters.jsm +++ b/browser/modules/ContentCrashHandlers.jsm @@ -8,7 +8,7 @@ var Cc = Components.classes; var Ci = Components.interfaces; var Cu = Components.utils; -this.EXPORTED_SYMBOLS = [ "TabCrashReporter", "PluginCrashReporter" ]; +this.EXPORTED_SYMBOLS = [ "TabCrashHandler", "PluginCrashReporter" ]; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); @@ -22,7 +22,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "RemotePages", XPCOMUtils.defineLazyModuleGetter(this, "SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"); -this.TabCrashReporter = { +this.TabCrashHandler = { _crashedTabCount: 0, get prefs() { diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 4e663ace5f7..ad128042807 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -17,7 +17,7 @@ EXTRA_JS_MODULES += [ 'CastingApps.jsm', 'Chat.jsm', 'ContentClick.jsm', - 'ContentCrashReporters.jsm', + 'ContentCrashHandlers.jsm', 'ContentLinkHandler.jsm', 'ContentObservers.jsm', 'ContentSearch.jsm',