Combining cards instead of merging

chrome/browser/resources/google_now/utility.js

Index: chrome/browser/resources/google_now/utility.js
diff --git a/chrome/browser/resources/google_now/utility.js b/chrome/browser/resources/google_now/utility.js
index 8214fefa04b45d6653ad266e7c4f1d4a208cf9ef..6674edf7754803d8a231179b383d8360daaed637 100644
--- a/chrome/browser/resources/google_now/utility.js
+++ b/chrome/browser/resources/google_now/utility.js
@@ -207,7 +207,7 @@ var wrapper = (function() {
    * An instance of WrapperPlugin can have state that can be shared by its
    * constructor, prologue() and epilogue(). Also WrapperPlugins can change
    * state of other objects, for example, to do refcounting.
-   * @type {function(): WrapperPlugin}
+   * @type {?function(): WrapperPlugin}
    */
   var wrapperPluginFactory = null;
 
@@ -712,7 +712,7 @@ function buildAuthenticationManager() {
   /**
    * Removes the specified cached token.
    * @param {string} token Authentication Token to remove from the cache.
-   * @param {function} callback Called on completion.
+   * @param {function()} callback Called on completion.
    */
   function removeToken(token, callback) {
     instrumented.identity.removeCachedAuthToken({token: token}, function() {
@@ -727,7 +727,7 @@ function buildAuthenticationManager() {
   /**
    * Registers a listener that gets called back when the signed in state
    * is found to be changed.
-   * @param {function} callback Called when the answer to isSignedIn changes.
+   * @param {function()} callback Called when the answer to isSignedIn changes.
    */
   function addListener(callback) {
     listeners.push(callback);