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

chrome/browser/resources/google_now/cards.js

 // Copyright 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';
 
 var MS_IN_SECOND = 1000;
 
 /**
  * Builds an object to manage notification card set.
@@ skipping 25 matching lines @@
    *     parameters for showing a Chrome notification.
    */
   function showNotification(cardId, cardCreateInfo) {
     console.log('cardManager.showNotification ' + cardId + ' ' +
                 JSON.stringify(cardCreateInfo));
 
     if (cardCreateInfo.previousVersion !== cardCreateInfo.version) {
       try {
         // Delete a notification with the specified id if it already exists, and
         // then create a notification.
-        chrome.notifications.create(
+        instrumented.notifications.create(
             cardId,
             cardCreateInfo.notification,
             function(newNotificationId) {
               if (!newNotificationId || chrome.runtime.lastError) {
                 var errorMessage = chrome.runtime.lastError &&
                                    chrome.runtime.lastError.message;
                 console.error('notifications.create: ID=' + newNotificationId +
                               ', ERROR=' + errorMessage);
                 return;
               }
 
               scheduleHiding(cardId, cardCreateInfo.timeHide);
             });
       } catch (error) {
         console.error('Error in notifications.create: ' + error);
       }
     } else {
       try {
         // Update existing notification.
-        chrome.notifications.update(
+        instrumented.notifications.update(
             cardId,
             cardCreateInfo.notification,
             function(wasUpdated) {
               if (!wasUpdated || chrome.runtime.lastError) {
                 var errorMessage = chrome.runtime.lastError &&
                                    chrome.runtime.lastError.message;
                 console.error('notifications.update: UPDATED=' + wasUpdated +
                               ', ERROR=' + errorMessage);
                 return;
               }
@@ skipping 63 matching lines @@
    * @param {string} cardId Card ID.
    */
   function clear(cardId) {
     console.log('cardManager.unregister ' + cardId);
 
     chrome.notifications.clear(cardId, function() {});
     chrome.alarms.clear(cardShowPrefix + cardId);
     chrome.alarms.clear(cardHidePrefix + cardId);
   }
 
-  chrome.alarms.onAlarm.addListener(function(alarm) {
+  instrumented.alarms.onAlarm.addListener(function(alarm) {
     console.log('cardManager.onAlarm ' + JSON.stringify(alarm));
 
     if (alarm.name.indexOf(cardShowPrefix) == 0) {
       // Alarm to show the card.
       var cardId = alarm.name.substring(cardShowPrefix.length);
-      storage.get('notificationsData', function(items) {
+      instrumented.storage.local.get('notificationsData', function(items) {
         items.notificationsData = items.notificationsData || {};
         console.log('cardManager.onAlarm.get ' + JSON.stringify(items));
         var notificationData = items.notificationsData[cardId];
         if (!notificationData)
           return;
 
         showNotification(cardId, notificationData.cardCreateInfo);
       });
     } else if (alarm.name.indexOf(cardHidePrefix) == 0) {
       // Alarm to hide the card.
       var cardId = alarm.name.substring(cardHidePrefix.length);
       chrome.notifications.clear(cardId, function() {});
     }
   });
 
   return {
     update: update,
     clear: clear
   };
 }