Bug 1242125 - Fix eslint errors in /browser/components/uitour. r=mattn

--HG--
extra : commitid : 9YOFmXUhUj9

.eslintignore

@@ -76,7 +76,6 @@ browser/components/sessionstore/**
 browser/components/shell/**
 browser/components/tabview/**
 browser/components/translation/**
-browser/components/uitour/**
 browser/extensions/pdfjs/**
 browser/extensions/pocket/content/panels/js/vendor/**
 browser/extensions/shumway/**

browser/components/uitour/UITour.jsm

@@ -2014,10 +2014,12 @@ this.UITour = {
         for (let engine of engines) {
           if (engine.identifier == aID) {
             Services.search.defaultEngine = engine;
-            return resolve();
+            resolve();
+            return;
           }
         }
         reject("selectSearchEngine could not find engine with given ID");
+        return;
       });
     });
   },

browser/components/uitour/test/browser_UITour_heartbeat.js

@@ -345,7 +345,7 @@ var tests = [
                               "What is this?", dummyURL);
   },
 
-  taskify(function test_invalidEngagementButtonLabel(done) {
+  taskify(function* test_invalidEngagementButtonLabel(done) {
     let engagementURL = "http://example.com";
     let flowId = "invalidEngagementButtonLabel-" + Math.random();
 
@@ -362,7 +362,7 @@ var tests = [
 
   }),
 
-  taskify(function test_privateWindowsOnly_noneOpen(done) {
+  taskify(function* test_privateWindowsOnly_noneOpen(done) {
     let engagementURL = "http://example.com";
     let flowId = "privateWindowsOnly_noneOpen-" + Math.random();
 
@@ -379,7 +379,7 @@ var tests = [
        "If there are no private windows opened, tour init should be prevented");
   }),
 
-  taskify(function test_privateWindowsOnly_notMostRecent(done) {
+  taskify(function* test_privateWindowsOnly_notMostRecent(done) {
     let engagementURL = "http://example.com";
     let flowId = "notMostRecent-" + Math.random();
 
@@ -406,7 +406,7 @@ var tests = [
     yield BrowserTestUtils.closeWindow(privateWin);
   }),
 
-  taskify(function test_privateWindowsOnly() {
+  taskify(function* test_privateWindowsOnly() {
     let engagementURL = "http://example.com";
     let learnMoreURL = "http://example.org/learnmore/";
     let flowId = "ui-privateWindowsOnly-" + Math.random();