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

@@ -8,3 +8,7 @@ overlay chrome://browser/content/browser.xul chrome://testpilot/content/tp-brows
 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

browser/app/profile/extensions/testpilot@labs.mozilla.com/components/TestPilot.js

@@ -46,7 +46,7 @@ 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,
@@ -56,7 +56,7 @@ TestPilotComponent.prototype = {
     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":
@@ -78,7 +78,9 @@ TestPilotComponent.prototype = {
   }
 };
 
-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);

browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf

@@ -4,7 +4,7 @@
      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, 
@@ -13,7 +13,7 @@
       <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>