Remove chrome.* Function Instrumentation Inlining and Use a Separate Instrumented Object

chrome/browser/resources/google_now/background.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 The event page for Google Now for Chrome implementation.
  * The Google Now event page gets Google Now cards from the server and shows
  * them as Chrome notifications.
@@ skipping 96 matching lines @@
        scheduledTaskName == DISMISS_CARD_TASK_NAME ||
        scheduledTaskName == RETRY_DISMISS_TASK_NAME)) {
     // No need to schedule retry-dismiss action if another action that tries to
     // send dismissals is scheduled.
     return true;
   }
 
   return false;
 }
 
-var googleGeolocationAccessEnabledPref =
-    chrome.preferencesPrivate.googleGeolocationAccessEnabled;
-
 var tasks = buildTaskManager(areTasksConflicting);
 
 // Add error processing to API calls.
-tasks.instrumentApiFunction(chrome.location.onLocationUpdate, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.notifications, 'create', 2);
-tasks.instrumentApiFunction(chrome.notifications, 'update', 2);
-tasks.instrumentApiFunction(chrome.notifications, 'getAll', 0);
-tasks.instrumentApiFunction(
-    chrome.notifications.onButtonClicked, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.notifications.onClicked, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.notifications.onClosed, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.omnibox.onInputEntered, 'addListener', 0);
-tasks.instrumentApiFunction(
-    googleGeolocationAccessEnabledPref,
-    'get',
+tasks.instrumentChromeApiFunction('location.onLocationUpdate.addListener', 0);
+tasks.instrumentChromeApiFunction('notifications.create', 2);
+tasks.instrumentChromeApiFunction('notifications.update', 2);
+tasks.instrumentChromeApiFunction('notifications.getAll', 0);
+tasks.instrumentChromeApiFunction(
+    'notifications.onButtonClicked.addListener', 0);
+tasks.instrumentChromeApiFunction('notifications.onClicked.addListener', 0);
+tasks.instrumentChromeApiFunction('notifications.onClosed.addListener', 0);
+tasks.instrumentChromeApiFunction('omnibox.onInputEntered.addListener', 0);
+tasks.instrumentChromeApiFunction(
+    'preferencesPrivate.googleGeolocationAccessEnabled.get',
     1);
-tasks.instrumentApiFunction(
-    googleGeolocationAccessEnabledPref.onChange,
-    'addListener',
+tasks.instrumentChromeApiFunction(
+    'preferencesPrivate.googleGeolocationAccessEnabled.onChange.addListener',
     0);
-tasks.instrumentApiFunction(chrome.runtime.onInstalled, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.runtime.onStartup, 'addListener', 0);
-tasks.instrumentApiFunction(chrome.tabs, 'create', 1);
-tasks.instrumentApiFunction(storage, 'get', 1);
+tasks.instrumentChromeApiFunction('runtime.onInstalled.addListener', 0);
+tasks.instrumentChromeApiFunction('runtime.onStartup.addListener', 0);
+tasks.instrumentChromeApiFunction('tabs.create', 1);
+tasks.instrumentChromeApiFunction('storage.local.get', 1);
 
 var updateCardsAttempts = buildAttemptManager(
     'cards-update',
     requestLocation,
     INITIAL_POLLING_PERIOD_SECONDS,
     MAXIMUM_POLLING_PERIOD_SECONDS);
 var dismissalAttempts = buildAttemptManager(
     'dismiss',
     retryPendingDismissals,
     INITIAL_RETRY_DISMISS_PERIOD_SECONDS,
@@ skipping 94 matching lines @@
     callback();
     return;
   }
 
   if (typeof parsedResponse.next_poll_seconds != 'number') {
     callback();
     return;
   }
 
   tasks.debugSetStepName('parseAndShowNotificationCards-storage-get');
-  storage.get(['notificationsData', 'recentDismissals'], function(items) {
-    console.log('parseAndShowNotificationCards-get ' + JSON.stringify(items));
-    items.notificationsData = items.notificationsData || {};
-    items.recentDismissals = items.recentDismissals || {};
+  instrumented.storage.local.get(['notificationsData', 'recentDismissals'],
+      function(items) {
+        console.log('parseAndShowNotificationCards-get ' +
+            JSON.stringify(items));
+        items.notificationsData = items.notificationsData || {};
+        items.recentDismissals = items.recentDismissals || {};
 
-    tasks.debugSetStepName(
-        'parseAndShowNotificationCards-notifications-getAll');
-    chrome.notifications.getAll(function(notifications) {
-      console.log('parseAndShowNotificationCards-getAll ' +
-          JSON.stringify(notifications));
-      // TODO(vadimt): Figure out what to do when notifications are disabled for
-      // our extension.
-      notifications = notifications || {};
+        tasks.debugSetStepName(
+            'parseAndShowNotificationCards-notifications-getAll');
+        instrumented.notifications.getAll(function(notifications) {
+          console.log('parseAndShowNotificationCards-getAll ' +
+              JSON.stringify(notifications));
+          // TODO(vadimt): Figure out what to do when notifications are
+          // disabled for our extension.
+          notifications = notifications || {};
 
-      // Build a set of non-expired recent dismissals. It will be used for
-      // client-side filtering of cards.
-      var updatedRecentDismissals = {};
-      var currentTimeMs = Date.now();
-      for (var notificationId in items.recentDismissals) {
-        if (currentTimeMs - items.recentDismissals[notificationId] <
-            DISMISS_RETENTION_TIME_MS) {
-          updatedRecentDismissals[notificationId] =
-              items.recentDismissals[notificationId];
-        }
-      }
+          // Build a set of non-expired recent dismissals. It will be used for
+          // client-side filtering of cards.
+          var updatedRecentDismissals = {};
+          var currentTimeMs = Date.now();
+          for (var notificationId in items.recentDismissals) {
+            if (currentTimeMs - items.recentDismissals[notificationId] <
+                DISMISS_RETENTION_TIME_MS) {
+              updatedRecentDismissals[notificationId] =
+                  items.recentDismissals[notificationId];
+            }
+          }
 
-      // Mark existing notifications that received an update in this server
-      // response.
-      var updatedNotifications = {};
+          // Mark existing notifications that received an update in this server
+          // response.
+          var updatedNotifications = {};
 
-      for (var i = 0; i < cards.length; ++i) {
-        var notificationId = cards[i].notificationId;
-        if (!(notificationId in updatedRecentDismissals) &&
-            notificationId in notifications) {
-          updatedNotifications[notificationId] = true;
-        }
-      }
+          for (var i = 0; i < cards.length; ++i) {
+            var notificationId = cards[i].notificationId;
+            if (!(notificationId in updatedRecentDismissals) &&
+                notificationId in notifications) {
+              updatedNotifications[notificationId] = true;
+            }
+          }
 
-      // Delete notifications that didn't receive an update.
-      for (var notificationId in notifications) {
-        console.log('parseAndShowNotificationCards-delete-check ' +
-                    notificationId);
-        if (!(notificationId in updatedNotifications)) {
-          console.log('parseAndShowNotificationCards-delete ' + notificationId);
-          cardSet.clear(notificationId);
-        }
-      }
+          // Delete notifications that didn't receive an update.
+          for (var notificationId in notifications) {
+            console.log('parseAndShowNotificationCards-delete-check ' +
+                        notificationId);
+            if (!(notificationId in updatedNotifications)) {
+              console.log('parseAndShowNotificationCards-delete ' +
+                  notificationId);
+              cardSet.clear(notificationId);
+            }
+          }
 
-      recordEvent(GoogleNowEvent.CARDS_PARSE_SUCCESS);
+          recordEvent(GoogleNowEvent.CARDS_PARSE_SUCCESS);
 
-      // Create/update notifications and store their new properties.
-      var newNotificationsData = {};
-      for (var i = 0; i < cards.length; ++i) {
-        var card = cards[i];
-        if (!(card.notificationId in updatedRecentDismissals)) {
-          var notificationData = items.notificationsData[card.notificationId];
-          var previousVersion = notifications[card.notificationId] &&
-                                notificationData &&
-                                notificationData.cardCreateInfo &&
-                                notificationData.cardCreateInfo.version;
-          newNotificationsData[card.notificationId] =
-              cardSet.update(card, previousVersion);
-        }
-      }
+          // Create/update notifications and store their new properties.
+          var newNotificationsData = {};
+          for (var i = 0; i < cards.length; ++i) {
+            var card = cards[i];
+            if (!(card.notificationId in updatedRecentDismissals)) {
+              var notificationData =
+                  items.notificationsData[card.notificationId];
+              var previousVersion = notifications[card.notificationId] &&
+                                    notificationData &&
+                                    notificationData.cardCreateInfo &&
+                                    notificationData.cardCreateInfo.version;
+              newNotificationsData[card.notificationId] =
+                  cardSet.update(card, previousVersion);
+            }
+          }
 
-      updateCardsAttempts.start(parsedResponse.next_poll_seconds);
+          updateCardsAttempts.start(parsedResponse.next_poll_seconds);
 
-      storage.set({
-        notificationsData: newNotificationsData,
-        recentDismissals: updatedRecentDismissals
+          chrome.storage.local.set({
+            notificationsData: newNotificationsData,
+            recentDismissals: updatedRecentDismissals
+          });
+          callback();
+        });
       });
-      callback();
-    });
-  });
 }
 
 /**
  * Removes all cards and card state on Google Now close down.
  * For example, this occurs when the geolocation preference is unchecked in the
  * content settings.
  */
 function removeAllCards() {
   console.log('removeAllCards');
 
   // TODO(robliao): Once Google Now clears its own checkbox in the
   // notifications center and bug 260376 is fixed, the below clearing
   // code is no longer necessary.
-  chrome.notifications.getAll(function(notifications) {
+  instrumented.notifications.getAll(function(notifications) {
     for (var notificationId in notifications) {
       chrome.notifications.clear(notificationId, function() {});
     }
-    storage.set({notificationsData: {}});
+    chrome.storage.local.set({notificationsData: {}});
   });
 }
 
 /**
  * Requests notification cards from the server.
  * @param {Location} position Location of this computer.
  * @param {function()} callback Completion callback.
  */
 function requestNotificationCards(position, callback) {
   console.log('requestNotificationCards ' + JSON.stringify(position) +
@@ skipping 136 matching lines @@
   });
 }
 
 /**
  * Tries to send dismiss requests for all pending dismissals.
  * @param {function(boolean)} callbackBoolean Completion callback with 'success'
  *     parameter. Success means that no pending dismissals are left.
  */
 function processPendingDismissals(callbackBoolean) {
   tasks.debugSetStepName('processPendingDismissals-storage-get');
-  storage.get(['pendingDismissals', 'recentDismissals'], function(items) {
-    console.log('processPendingDismissals-storage-get ' +
-                JSON.stringify(items));
-    items.pendingDismissals = items.pendingDismissals || [];
-    items.recentDismissals = items.recentDismissals || {};
+  instrumented.storage.local.get(['pendingDismissals', 'recentDismissals'],
+      function(items) {
+        console.log('processPendingDismissals-storage-get ' +
+                    JSON.stringify(items));
+        items.pendingDismissals = items.pendingDismissals || [];
+        items.recentDismissals = items.recentDismissals || {};
 
-    var dismissalsChanged = false;
+        var dismissalsChanged = false;
 
-    function onFinish(success) {
-      if (dismissalsChanged) {
-        storage.set({
-          pendingDismissals: items.pendingDismissals,
-          recentDismissals: items.recentDismissals
-        });
-      }
-      callbackBoolean(success);
-    }
+        function onFinish(success) {
+          if (dismissalsChanged) {
+            chrome.storage.local.set({
+              pendingDismissals: items.pendingDismissals,
+              recentDismissals: items.recentDismissals
+            });
+          }
+          callbackBoolean(success);
+        }
 
-    function doProcessDismissals() {
-      if (items.pendingDismissals.length == 0) {
-        dismissalAttempts.stop();
-        onFinish(true);
-        return;
-      }
+        function doProcessDismissals() {
+          if (items.pendingDismissals.length == 0) {
+            dismissalAttempts.stop();
+            onFinish(true);
+            return;
+          }
 
-      // Send dismissal for the first card, and if successful, repeat
-      // recursively with the rest.
-      var dismissal = items.pendingDismissals[0];
-      requestCardDismissal(
-          dismissal.notificationId,
-          dismissal.time,
-          dismissal.parameters,
-          function(done) {
-            if (done) {
-              dismissalsChanged = true;
-              items.pendingDismissals.splice(0, 1);
-              items.recentDismissals[dismissal.notificationId] = Date.now();
-              doProcessDismissals();
-            } else {
-              onFinish(false);
-            }
-          });
-    }
+          // Send dismissal for the first card, and if successful, repeat
+          // recursively with the rest.
+          var dismissal = items.pendingDismissals[0];
+          requestCardDismissal(
+              dismissal.notificationId,
+              dismissal.time,
+              dismissal.parameters,
+              function(done) {
+                if (done) {
+                  dismissalsChanged = true;
+                  items.pendingDismissals.splice(0, 1);
+                  items.recentDismissals[dismissal.notificationId] = Date.now();
+                  doProcessDismissals();
+                } else {
+                  onFinish(false);
+                }
+              });
+        }
 
-    doProcessDismissals();
-  });
+        doProcessDismissals();
+      });
 }
 
 /**
  * Submits a task to send pending dismissals.
  */
 function retryPendingDismissals() {
   tasks.add(RETRY_DISMISS_TASK_NAME, function(callback) {
     dismissalAttempts.planForNext(function() {
       processPendingDismissals(function(success) { callback(); });
      });
   });
 }
 
 /**
  * Opens URL corresponding to the clicked part of the notification.
  * @param {string} notificationId Unique identifier of the notification.
  * @param {function(Object): string} selector Function that extracts the url for
  *     the clicked area from the button action URLs info.
  */
 function onNotificationClicked(notificationId, selector) {
-  storage.get('notificationsData', function(items) {
+  instrumented.storage.local.get('notificationsData', function(items) {
     items.notificationsData = items.notificationsData || {};
 
     var notificationData = items.notificationsData[notificationId];
 
     if (!notificationData) {
       // 'notificationsData' in storage may not match the actual list of
       // notifications.
       return;
     }
 
     var actionUrls = notificationData.actionUrls;
     if (typeof actionUrls != 'object') {
       return;
     }
 
     var url = selector(actionUrls);
 
     if (typeof url != 'string')
       return;
 
-    chrome.tabs.create({url: url}, function(tab) {
+    instrumented.tabs.create({url: url}, function(tab) {
       if (!tab)
         chrome.windows.create({url: url});
     });
   });
 }
 
 /**
  * Responds to a click of one of the buttons on the welcome toast.
  * @param {number} buttonIndex The index of the button which was clicked.
  */
 function onToastNotificationClicked(buttonIndex) {
-  storage.set({userRespondedToToast: true});
+  chrome.storage.local.set({userRespondedToToast: true});
 
   if (buttonIndex == ToastButtonIndex.YES) {
     chrome.metricsPrivate.recordUserAction('GoogleNow.WelcomeToastClickedYes');
-    googleGeolocationAccessEnabledPref.set({value: true});
+    chrome.preferencesPrivate.googleGeolocationAccessEnabled.set({value: true});
     // The googlegeolocationaccessenabled preference change callback
     // will take care of starting the poll for cards.
   } else {
     chrome.metricsPrivate.recordUserAction('GoogleNow.WelcomeToastClickedNo');
     onStateChange();
   }
 }
 
 /**
  * Callback for chrome.notifications.onClosed event.
  * @param {string} notificationId Unique identifier of the notification.
  * @param {boolean} byUser Whether the notification was closed by the user.
  */
 function onNotificationClosed(notificationId, byUser) {
   if (!byUser)
     return;
 
   if (notificationId == WELCOME_TOAST_NOTIFICATION_ID) {
     // Even though they only closed the notification without clicking no, treat
     // it as though they clicked No anwyay, and don't show the toast again.
     chrome.metricsPrivate.recordUserAction('GoogleNow.WelcomeToastDismissed');
-    storage.set({userRespondedToToast: true});
+    chrome.storage.local.set({userRespondedToToast: true});
     return;
   }
 
   // At this point we are guaranteed that the notification is a now card.
   chrome.metricsPrivate.recordUserAction('GoogleNow.Dismissed');
 
   tasks.add(DISMISS_CARD_TASK_NAME, function(callback) {
     dismissalAttempts.start();
 
     // Deleting the notification in case it was re-added while this task was
     // scheduled, waiting for execution.
     cardSet.clear(notificationId);
 
     tasks.debugSetStepName('onNotificationClosed-storage-get');
-    storage.get(['pendingDismissals', 'notificationsData'], function(items) {
-      items.pendingDismissals = items.pendingDismissals || [];
-      items.notificationsData = items.notificationsData || {};
+    instrumented.storage.local.get(['pendingDismissals', 'notificationsData'],
+        function(items) {
+          items.pendingDismissals = items.pendingDismissals || [];
+          items.notificationsData = items.notificationsData || {};
 
-      var notificationData = items.notificationsData[notificationId];
+          var notificationData = items.notificationsData[notificationId];
 
-      var dismissal = {
-        notificationId: notificationId,
-        time: Date.now(),
-        parameters: notificationData && notificationData.dismissalParameters
-      };
-      items.pendingDismissals.push(dismissal);
-      storage.set({pendingDismissals: items.pendingDismissals});
-      processPendingDismissals(function(success) { callback(); });
-    });
+          var dismissal = {
+            notificationId: notificationId,
+            time: Date.now(),
+            parameters: notificationData && notificationData.dismissalParameters
+          };
+          items.pendingDismissals.push(dismissal);
+          chrome.storage.local.set(
+              {pendingDismissals: items.pendingDismissals});
+          processPendingDismissals(function(success) { callback(); });
+        });
   });
 }
 
 /**
  * Initializes the polling system to start monitoring location and fetching
  * cards.
  */
 function startPollingCards() {
   // Create an update timer for a case when for some reason location request
   // gets stuck.
@@ skipping 53 matching lines @@
 
 /**
  * Shows or hides the toast.
  * @param {boolean} visibleRequest true to show the toast and
  *     false to hide the toast.
  * @param {function} callback Called on completion.
  */
 function setToastVisible(visibleRequest, callback) {
   tasks.debugSetStepName(
       'setToastVisible-shouldSetToastVisible-getAllNotifications');
-  chrome.notifications.getAll(function(notifications) {
+  instrumented.notifications.getAll(function(notifications) {
     // TODO(vadimt): Figure out what to do when notifications are disabled for
     // our extension.
     notifications = notifications || {};
 
     if (visibleRequest != !!notifications[WELCOME_TOAST_NOTIFICATION_ID]) {
       console.log('Action Taken setToastVisible=' + visibleRequest);
       if (visibleRequest)
         showWelcomeToast();
       else
         hideWelcomeToast();
@@ skipping 28 matching lines @@
 
   var shouldSetToastVisible = false;
   var shouldPollCards = false;
 
   if (signedIn) {
     if (geolocationEnabled) {
       if (!userRespondedToToast) {
         // If the user enabled geolocation independently of Google Now,
         // the user has implicitly responded to the toast.
         // We do not want to show it again.
-        storage.set({userRespondedToToast: true});
+        chrome.storage.local.set({userRespondedToToast: true});
       }
 
       shouldPollCards = true;
     } else {
       if (userRespondedToToast) {
         recordEvent(GoogleNowEvent.USER_SUPPRESSED);
       } else {
         shouldSetToastVisible = true;
       }
     }
@@ skipping 14 matching lines @@
  * Coordinates the behavior of Google Now for Chrome depending on
  * Chrome and extension state.
  */
 function onStateChange() {
   tasks.add(STATE_CHANGED_TASK_NAME, function(callback) {
     tasks.debugSetStepName('onStateChange-isSignedIn');
     authenticationManager.isSignedIn(function(token) {
       var signedIn = !!token && !!NOTIFICATION_CARDS_URL;
       tasks.debugSetStepName(
           'onStateChange-get-googleGeolocationAccessEnabledPref');
-      googleGeolocationAccessEnabledPref.get({}, function(prefValue) {
-        var geolocationEnabled = !!prefValue.value;
-        tasks.debugSetStepName(
-          'onStateChange-get-userRespondedToToast');
-        storage.get('userRespondedToToast', function(items) {
-          var userRespondedToToast = !!items.userRespondedToToast;
-          updateRunningState(
-              signedIn,
-              geolocationEnabled,
-              userRespondedToToast,
-              callback);
-        });
+      instrumented.
+          preferencesPrivate.
+          googleGeolocationAccessEnabled.
+          get({}, function(prefValue) {
+            var geolocationEnabled = !!prefValue.value;
+            tasks.debugSetStepName(
+              'onStateChange-get-userRespondedToToast');
+            instrumented.storage.local.get(
+                'userRespondedToToast',
+                function(items) {
+                  var userRespondedToToast = !!items.userRespondedToToast;
+                  updateRunningState(
+                      signedIn,
+                      geolocationEnabled,
+                      userRespondedToToast,
+                      callback);
+                });
       });

[xiyuan, 2013/08/08 23:26:29]

nit: this should align with 'get' at line 823 since it's the closing part of the
function started there.

[robliao, 2013/08/09 00:44:52]

Done.

     });
   });
 }
 
 /**
  * Displays a toast to the user asking if they want to opt in to receiving
  * Google Now cards.
  */
 function showWelcomeToast() {
   recordEvent(GoogleNowEvent.SHOW_WELCOME_TOAST);
   // TODO(zturner): Localize this once the component extension localization
   // api is complete.
   // TODO(zturner): Add icons.
   var buttons = [{title: 'Yes'}, {title: 'No'}];
   var options = {
     type: 'basic',
     title: 'Enable Google Now Cards',
     message: 'Would you like to be shown Google Now cards?',
     iconUrl: 'http://www.gstatic.com/googlenow/chrome/default.png',
     priority: 2,
     buttons: buttons
   };
-  chrome.notifications.create(WELCOME_TOAST_NOTIFICATION_ID, options,
+  instrumented.notifications.create(WELCOME_TOAST_NOTIFICATION_ID, options,
       function(notificationId) {});
 }
 
 /**
  * Hides the welcome toast.
  */
 function hideWelcomeToast() {
   chrome.notifications.clear(
       WELCOME_TOAST_NOTIFICATION_ID,
       function() {});
 }
 
-chrome.runtime.onInstalled.addListener(function(details) {
+instrumented.runtime.onInstalled.addListener(function(details) {
   console.log('onInstalled ' + JSON.stringify(details));
   if (details.reason != 'chrome_update') {
     initialize();
   }
 });
 
-chrome.runtime.onStartup.addListener(function() {
+instrumented.runtime.onStartup.addListener(function() {
   console.log('onStartup');
   initialize();
 });
 
-googleGeolocationAccessEnabledPref.onChange.addListener(function(prefValue) {
-  console.log('googleGeolocationAccessEnabledPref onChange ' + prefValue.value);
-  onStateChange();
+instrumented.
+    preferencesPrivate.
+    googleGeolocationAccessEnabled.
+    onChange.
+    addListener(function(prefValue) {
+      console.log('googleGeolocationAccessEnabled Pref onChange ' +
+          prefValue.value);
+      onStateChange();
 });
 
 authenticationManager.addListener(function() {
   console.log('signIn State Change');
   onStateChange();
 });
 
-chrome.notifications.onClicked.addListener(
+instrumented.notifications.onClicked.addListener(
     function(notificationId) {
       chrome.metricsPrivate.recordUserAction('GoogleNow.MessageClicked');
       onNotificationClicked(notificationId, function(actionUrls) {
         return actionUrls.messageUrl;
       });
     });
 
-chrome.notifications.onButtonClicked.addListener(
+instrumented.notifications.onButtonClicked.addListener(
     function(notificationId, buttonIndex) {
       if (notificationId == WELCOME_TOAST_NOTIFICATION_ID) {
         onToastNotificationClicked(buttonIndex);
       } else {
         chrome.metricsPrivate.recordUserAction(
             'GoogleNow.ButtonClicked' + buttonIndex);
         onNotificationClicked(notificationId, function(actionUrls) {
           if (!Array.isArray(actionUrls.buttonUrls))
             return undefined;
 
           return actionUrls.buttonUrls[buttonIndex];
         });
       }
     });
 
-chrome.notifications.onClosed.addListener(onNotificationClosed);
+instrumented.notifications.onClosed.addListener(onNotificationClosed);
 
-chrome.location.onLocationUpdate.addListener(function(position) {
+instrumented.location.onLocationUpdate.addListener(function(position) {
   recordEvent(GoogleNowEvent.LOCATION_UPDATE);
   updateNotificationsCards(position);
 });
 
-chrome.omnibox.onInputEntered.addListener(function(text) {
+instrumented.omnibox.onInputEntered.addListener(function(text) {
   localStorage['server_url'] = NOTIFICATION_CARDS_URL = text;
   initialize();
 });