Add Optin Retry Logic to Google Now

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 630 matching lines @@
  *     PromiseRejection.ALLOW, allow promise rejection on errors, otherwise the
  *     default storage object is resolved.
  * @return {Promise} A promise that fills the default storage object. On
  *     failure, if promise rejection is allowed, the promise is rejected,
  *     otherwise it is resolved to the default storage object.
  */
 function fillFromChromeLocalStorage(
     defaultStorageObject,
     opt_allowPromiseRejection) {
   return new Promise(function(resolve, reject) {
-    instrumented.storage.local.get(defaultStorageObject, function(items) {
+    // We have to create a keys array because keys with a default value
+    // of undefined will cause that key to not be looked up!
+    var keysToGet = [];
+    for (var key in defaultStorageObject) {
+      keysToGet.push(key);
+    }
+    instrumented.storage.local.get(keysToGet, function(items) {
       if (items) {
-        resolve(items);
+        // Merge the result with the default storage object to ensure all keys
+        // requested have either the default value or the retrieved storage
+        // value.
+        var result = {};
+        for (var key in defaultStorageObject) {
+          result[key] = (key in items) ? items[key] : defaultStorageObject[key];
+        }
+        resolve(result);
       } else if (opt_allowPromiseRejection === PromiseRejection.ALLOW) {
         reject();
       } else {
         resolve(defaultStorageObject);
       }
     });
   });
 }
 
 /**
@@ skipping 363 matching lines @@
   // One hour is just an arbitrary amount of time chosen.
   chrome.alarms.create(alarmName, {periodInMinutes: 60});
 
   return {
     addListener: addListener,
     getAuthToken: getAuthToken,
     isSignedIn: isSignedIn,
     removeToken: removeToken
   };
 }