From 7b198df002935bbb5c883ca7691ec65a6963c624 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Fri, 26 Jan 2007 06:56:58 +0000
Subject: [PATCH] Fix missed renaming in reftest.  b=368158  r=rcampbell

---
 layout/tools/reftest/reftest-cmdline.js | 16 ++++++++--------
 layout/tools/reftest/reftest.js         |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layout/tools/reftest/reftest-cmdline.js b/layout/tools/reftest/reftest-cmdline.js
index b9900fe82531..def1d6f47bc0 100644
--- a/layout/tools/reftest/reftest-cmdline.js
+++ b/layout/tools/reftest/reftest-cmdline.js
@@ -39,8 +39,8 @@
 // NOTE: this file implements both the seamonkey nsICmdLineHandler and
 // the toolkit nsICommandLineHandler, using runtime detection.
 
-const LAYOUTATEST_CMDLINE_CONTRACTID = "@mozilla.org/commandlinehandler/general-startup;1?type=reftest";
-const LAYOUTATEST_CMDLINE_CLSID      = Components.ID('{32530271-8c1b-4b7d-a812-218e42c6bb23}');
+const REFTEST_CMDLINE_CONTRACTID     = "@mozilla.org/commandlinehandler/general-startup;1?type=reftest";
+const REFTEST_CMDLINE_CLSID          = Components.ID('{32530271-8c1b-4b7d-a812-218e42c6bb23}');
 const CATMAN_CONTRACTID              = "@mozilla.org/categorymanager;1";
 const nsISupports                    = Components.interfaces.nsISupports;
   
@@ -127,9 +127,9 @@ var LayoutATestCmdLineModule =
   {
     compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
 
-    compMgr.registerFactoryLocation(LAYOUTATEST_CMDLINE_CLSID,
+    compMgr.registerFactoryLocation(REFTEST_CMDLINE_CLSID,
                                     "LayoutATest CommandLine Service",
-                                    LAYOUTATEST_CMDLINE_CONTRACTID,
+                                    REFTEST_CMDLINE_CONTRACTID,
                                     fileSpec,
                                     location,
                                     type);
@@ -137,17 +137,17 @@ var LayoutATestCmdLineModule =
     var catman = Components.classes[CATMAN_CONTRACTID].getService(nsICategoryManager);
     catman.addCategoryEntry("command-line-argument-handlers",
                             "reftest command line handler",
-                            LAYOUTATEST_CMDLINE_CONTRACTID, true, true);
+                            REFTEST_CMDLINE_CONTRACTID, true, true);
     catman.addCategoryEntry("command-line-handler",
                             "m-reftest",
-                            LAYOUTATEST_CMDLINE_CONTRACTID, true, true);
+                            REFTEST_CMDLINE_CONTRACTID, true, true);
   },
 
   unregisterSelf : function(compMgr, fileSpec, location)
   {
     compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
 
-    compMgr.unregisterFactoryLocation(LAYOUTATEST_CMDLINE_CLSID, fileSpec);
+    compMgr.unregisterFactoryLocation(REFTEST_CMDLINE_CLSID, fileSpec);
     catman = Components.classes[CATMAN_CONTRACTID].getService(nsICategoryManager);
     catman.deleteCategoryEntry("command-line-argument-handlers",
                                "reftest command line handler", true);
@@ -157,7 +157,7 @@ var LayoutATestCmdLineModule =
 
   getClassObject : function(compMgr, cid, iid)
   {
-    if (cid.equals(LAYOUTATEST_CMDLINE_CLSID)) {
+    if (cid.equals(REFTEST_CMDLINE_CLSID)) {
       return LayoutATestCmdLineFactory;
     }
 
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 6345e0f6e49d..ab7f8f308a57 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -165,7 +165,7 @@ function DocumentLoaded()
             break;
         case 2:
             var equal = (key == gPart1Key);
-            var result = "LAYOUTATEST ";
+            var result = "REFTEST ";
             var test_passed = (equal == gURLs[0].equal);
             var result_expected = (test_passed == !gURLs[0].fail_expected);
             if (!result_expected) {
@@ -182,8 +182,8 @@ function DocumentLoaded()
             result += gURLs[0].url1.spec;
             dump(result + "\n");
             if (!test_passed && !result_expected) {
-                dump("LAYOUTATEST   IMAGE 1: " + gPart1Key + "\n");
-                dump("LAYOUTATEST   IMAGE 2: " + key + "\n");
+                dump("REFTEST   IMAGE 1: " + gPart1Key + "\n");
+                dump("REFTEST   IMAGE 2: " + key + "\n");
             }
 
             gPart1Key = undefined;