From f29d2bb38c91d04e7733088308823c34fc390b6d Mon Sep 17 00:00:00 2001
From: Wes Kocher <kwierso@gmail.com>
Date: Mon, 26 Aug 2013 07:32:05 -0700
Subject: [PATCH] Revert "Merge pull request #1182 from erikvold/865391"

This reverts commit 1ab0df2193e9b5cfb9ef7b0699e586c4abee1bed, reversing
changes made to bd177f2c7773c3dfd7ae77f0069b32ed961f2022.
---
 lib/sdk/addon/runner.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/sdk/addon/runner.js b/lib/sdk/addon/runner.js
index 53b316006..c70c7edaa 100644
--- a/lib/sdk/addon/runner.js
+++ b/lib/sdk/addon/runner.js
@@ -13,7 +13,6 @@ const { exit, env, staticArgs } = require('../system');
 const { when: unload } = require('../system/unload');
 const { loadReason } = require('../self');
 const { rootURI } = require("@loader/options");
-const cfxArgs = require("@test/options");
 const globals = require('../system/globals');
 const xulApp = require('../system/xul-app');
 const appShellService = Cc['@mozilla.org/appshell/appShellService;1'].
@@ -102,11 +101,7 @@ function startup(reason, options) {
   // Run the addon even in case of error (best effort approach)
   require('../l10n/loader').
     load(rootURI).
-    then(function l10nSuccess() {
-      if (cfxArgs.parseable) {
-        console.info("localization information has loaded successfully.");
-      }
-    }, function l10nFailure(error) {
+    then(null, function failure(error) {
       console.info("Error while loading localization: " + error.message);
     }).
     then(function onLocalizationReady(data) {
@@ -115,10 +110,6 @@ function startup(reason, options) {
       definePseudo(options.loader, '@l10n/data', data ? data : null);
       return ready;
     }).then(function() {
-      if (cfxArgs.parseable) {
-        console.info("addon window has loaded successfully.");
-      }
-
       run(options);
     }).then(null, console.exception);
 }
@@ -137,7 +128,6 @@ function run(options) {
     catch(error) {
       console.exception(error);
     }
-
     // Initialize inline options localization, without preventing addon to be
     // run in case of error
     try {
@@ -167,8 +157,7 @@ function run(options) {
         quit: exit
       });
     }
-  }
-  catch (error) {
+  } catch (error) {
     console.exception(error);
     throw error;
   }