Finishing API error processing, and cleanup

chrome/browser/resources/google_now/utility.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @fileoverview Utility objects and functions for Google Now extension.
  * Most important entities here:
  * (1) 'wrapper' is a module used to add error handling and other services to
@@ skipping 378 matching lines @@
  * Builds the object to manage tasks (mutually exclusive chains of events).
  * @param {function(string, string): boolean} areConflicting Function that
  *     checks if a new task can't be added to a task queue that contains an
  *     existing task.
  * @return {Object} Task manager interface.
  */
 function buildTaskManager(areConflicting) {
   /**
    * Queue of scheduled tasks. The first element, if present, corresponds to the
    * currently running task.
-   * @type {Array.<Object.<string, function(function())>>}
+   * @type {Array.<Object.<string, function()>>}
    */
   var queue = [];
 
   /**
    * Count of unfinished callbacks of the current task.
    * @type {number}
    */
   var taskPendingCallbackCount = 0;
 
   /**
@@ skipping 13 matching lines @@
     // Start the oldest queued task, but don't remove it from the queue.
     verify(
         taskPendingCallbackCount == 0,
         'tasks.startFirst: still have pending task callbacks: ' +
         taskPendingCallbackCount +
         ', queue = ' + JSON.stringify(queue) + ', ' +
         wrapper.debugGetStateString());
     var entry = queue[0];
     console.log('Starting task ' + entry.name);
 
-    entry.task(function() {});  // TODO(vadimt): Don't pass parameter.
+    entry.task();
 
     verify(isInTask, 'startFirst: not in task at exit');
     isInTask = false;
     if (taskPendingCallbackCount == 0)
       finish();
   }
 
   /**
    * Checks if a new task can be added to the task queue.
    * @param {string} taskName Name of the new task.
    * @return {boolean} Whether the new task can be added.
    */
   function canQueue(taskName) {
     for (var i = 0; i < queue.length; ++i) {
       if (areConflicting(taskName, queue[i].name)) {
         console.log('Conflict: new=' + taskName +
                     ', scheduled=' + queue[i].name);
         return false;
       }
     }
 
     return true;
   }
 
   /**
    * Adds a new task. If another task is not running, runs the task immediately.
    * If any task in the queue is not compatible with the task, ignores the new
    * task. Otherwise, stores the task for future execution.
    * @param {string} taskName Name of the task.
-   * @param {function(function())} task Function to run. Takes a callback
-   *     parameter. Call this callback on completion.
+   * @param {function()} task Function to run.
    */
   function add(taskName, task) {
     wrapper.checkInWrappedCallback();
     console.log('Adding task ' + taskName);
     if (!canQueue(taskName))
       return;
 
     queue.push({name: taskName, task: task});
 
     if (queue.length == 1) {
@@ skipping 55 matching lines @@
           finish();
       }
     }
   };
 
   wrapper.registerWrapperPluginFactory(function() {
     return new TasksWrapperPlugin();
   });
 
   return {
-    add: add,
-    debugSetStepName: function() {}  // TODO(vadimt): remove
+    add: add
   };
 }
 
 /**
  * Builds an object to manage retrying activities with exponential backoff.
  * @param {string} name Name of this attempt manager.
  * @param {function()} attempt Activity that the manager retries until it
  *     calls 'stop' method.
  * @param {number} initialDelaySeconds Default first delay until first retry.
  * @param {number} maximumDelaySeconds Maximum delay between retries.
@@ skipping 182 matching lines @@
   // Poll for the sign in state every hour.
   // One hour is just an arbitrary amount of time chosen.
   chrome.alarms.create(alarmName, {periodInMinutes: 60});
 
   return {
     addListener: addListener,
     isSignedIn: isSignedIn,
     removeToken: removeToken
   };
 }