Bug 708076 - Clean up redundant components in AboutRedirector.js [r=mfinkle]

--HG--
extra : rebase_source : 38525ed687358cd99de2c4593fa13e0b806b2b44

mobile/android/components/AboutRedirector.js

@@ -79,9 +79,10 @@ let modules = {
   }
 }
 
-function AboutGeneric() {}
-AboutGeneric.prototype = {
+function AboutRedirector() {}
+AboutRedirector.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+  classID: Components.ID("{322ba47e-7047-4f71-aebf-cb7d69325cd9}"),
 
   _getModuleInfo: function (aURI) {
     let moduleName = aURI.path.replace(/[?#].*/, "").toLowerCase();
@@ -114,41 +115,5 @@ AboutGeneric.prototype = {
   }
 };
 
-function About() {}
-About.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{322ba47e-7047-4f71-aebf-cb7d69325cd9}")
-}
-
-function AboutEmpty() {}
-AboutEmpty.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{433d2d75-5923-49b0-854d-f37267b03dc7}")
-}
-
-function AboutRights() {}
-AboutRights.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{3b988fbf-ec97-4e1c-a5e4-573d999edc9c}")
-}
-
-function AboutCertError() {}
-AboutCertError.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{972efe64-8ac0-4e91-bdb0-22835d987815}")
-}
-
-function AboutHome() {}
-AboutHome.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{b071364f-ab68-4669-a9db-33fca168271a}")
-}
-
-function AboutBlocked() {}
-AboutBlocked.prototype = {
-  __proto__: AboutGeneric.prototype,
-  classID: Components.ID("{88fd40b6-c5c2-4120-9238-f2cb9ff98928}")
-}
-
-const components = [About, AboutEmpty, AboutRights, AboutCertError, AboutHome, AboutBlocked];
+const components = [AboutRedirector];
 const NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

mobile/android/components/MobileComponents.manifest

@@ -3,17 +3,12 @@ component {322ba47e-7047-4f71-aebf-cb7d69325cd9} AboutRedirector.js
 contract @mozilla.org/network/protocol/about;1?what= {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 contract @mozilla.org/network/protocol/about;1?what=fennec {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 contract @mozilla.org/network/protocol/about;1?what=firefox {322ba47e-7047-4f71-aebf-cb7d69325cd9}
-component {433d2d75-5923-49b0-854d-f37267b03dc7} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=empty {433d2d75-5923-49b0-854d-f37267b03dc7}
-component {3b988fbf-ec97-4e1c-a5e4-573d999edc9c} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=rights {3b988fbf-ec97-4e1c-a5e4-573d999edc9c}
-component {972efe64-8ac0-4e91-bdb0-22835d987815} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=certerror {972efe64-8ac0-4e91-bdb0-22835d987815}
-component {b071364f-ab68-4669-a9db-33fca168271a} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=home {b071364f-ab68-4669-a9db-33fca168271a}
+contract @mozilla.org/network/protocol/about;1?what=empty {322ba47e-7047-4f71-aebf-cb7d69325cd9}
+contract @mozilla.org/network/protocol/about;1?what=rights {322ba47e-7047-4f71-aebf-cb7d69325cd9}
+contract @mozilla.org/network/protocol/about;1?what=certerror {322ba47e-7047-4f71-aebf-cb7d69325cd9}
+contract @mozilla.org/network/protocol/about;1?what=home {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #ifdef MOZ_SAFE_BROWSING
-component {88fd40b6-c5c2-4120-9238-f2cb9ff98928} AboutRedirector.js
-contract @mozilla.org/network/protocol/about;1?what=blocked {88fd40b6-c5c2-4120-9238-f2cb9ff98928}
+contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #endif
 
 # DirectoryProvider.js