Bug 580227: Upgrade Test Pilot for the new component registration changes. r=dtownsend landing on a CLOSED TREE
authorBenjamin Smedberg <benjamin@smedbergs.us>
Tue, 20 Jul 2010 10:42:17 -0700
changeset 47983 1a63c61cdc6a40b0fd247c8c7ac112f22a5cf43c
parent 47982 737a08309d9723abaced1c7126e084db97b05a9d
child 47984 96f203dcd41d06aa9e3d010d9d3c1ab779cbdf5e
push id14517
push userdtownsend@mozilla.com
push dateTue, 20 Jul 2010 17:49:26 +0000
treeherdermozilla-central@1a63c61cdc6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend
bugs580227
milestone2.0b2pre
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 580227: Upgrade Test Pilot for the new component registration changes. r=dtownsend landing on a CLOSED TREE
browser/app/profile/extensions/testpilot@labs.mozilla.com/chrome.manifest
browser/app/profile/extensions/testpilot@labs.mozilla.com/components/TestPilot.js
browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/chrome.manifest
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/chrome.manifest
@@ -3,8 +3,12 @@ content testpilot content/
 skin testpilot skin skin/all/
 skin testpilot-os skin skin/linux/ os=Linux
 skin testpilot-os skin skin/mac/ os=Darwin
 skin testpilot-os skin skin/win/ os=WINNT
 overlay chrome://browser/content/browser.xul chrome://testpilot/content/tp-browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion<=3.6.*
 overlay chrome://browser/content/browser.xul chrome://testpilot/content/feedback-browser.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} appversion>3.7a1pre
 # For the menubar on Mac
 overlay chrome://testpilot/content/all-studies-window.xul chrome://browser/content/macBrowserOverlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} os=Darwin
+
+component {e6e5e58f-7977-485a-b076-2f74bee2677b} components/TestPilot.js
+contract @mozilla.org/testpilot/service;1 {e6e5e58f-7977-485a-b076-2f74bee2677b}
+category profile-after-change testpilot @mozilla.org/testpilot/service;1
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/components/TestPilot.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/components/TestPilot.js
@@ -41,27 +41,27 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function TestPilotComponent() {}
 TestPilotComponent.prototype = {
   classDescription: "Test Pilot Component",
   contractID: "@mozilla.org/testpilot/service;1",
   classID: Components.ID("{e6e5e58f-7977-485a-b076-2f74bee2677b}"),
-  _xpcom_categories: [{ category: "app-startup", service: true }],
+  _xpcom_categories: [{ category: "profile-after-change" }],
   _startupTimer: null,
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
                                          Ci.nsISupportsWeakReference]),
 
   observe: function TPC__observe(subject, topic, data) {
     let os = Cc["@mozilla.org/observer-service;1"].
         getService(Ci.nsIObserverService);
     switch (topic) {
-    case "app-startup":
+    case "profile-after-change":
       os.addObserver(this, "sessionstore-windows-restored", true);
       break;
     case "sessionstore-windows-restored":
       /* Stop oberver, to ensure that globalStartup doesn't get
        * called more than once. */
       os.removeObserver(this, "sessionstore-windows-restored", false);
       /* Call global startup on a timer so that it's off of the main
        * thread... delay a few seconds to give firefox time to finish
@@ -73,12 +73,14 @@ TestPilotComponent.prototype = {
            Cu.import("resource://testpilot/modules/setup.js");
            TestPilotSetup.globalStartup();
          }}, 10000, Ci.nsITimer.TYPE_ONE_SHOT);
       break;
     }
   }
 };
 
-function NSGetModule(compMgr, fileSpec) {
-  return XPCOMUtils.generateModule([TestPilotComponent]);
-}
-
+const components = [TestPilotComponent];
+var NSGetFactory, NSGetModule;
+if (XPCOMUtils.generateNSGetFactory)
+  NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
+else
+  NSGetModule = XPCOMUtils.generateNSGetModule(components);
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>testpilot@labs.mozilla.com</em:id>
-    <em:version>1.0rc1</em:version>
+    <em:version>1.0</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into, 
          with minimum and maximum supported versions. --> 
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>4.0b1</em:maxVersion>
+        <em:maxVersion>4.0b2</em:maxVersion>
       </Description>
     </em:targetApplication>
    
     <!-- Front End MetaData -->
     <em:name>Feedback</em:name>
     <em:description>Help make Firefox better by giving feedback.</em:description>
     <em:creator>Mozilla Corporation</em:creator>
     <em:homepageURL>http://testpilot.mozillalabs.com/</em:homepageURL>