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

chrome/browser/resources/google_now/background_test_util.js

Index: chrome/browser/resources/google_now/background_test_util.js
diff --git a/chrome/browser/resources/google_now/background_test_util.js b/chrome/browser/resources/google_now/background_test_util.js
index 3e52dd772ae52e5c5bf3767cf0d3d82fd1e65cc5..3d59e0f6d3f5bbdf26f606f18129d7ed5f9c5bb0 100644
--- a/chrome/browser/resources/google_now/background_test_util.js
+++ b/chrome/browser/resources/google_now/background_test_util.js
@@ -9,7 +9,7 @@ function emptyMock() {}
 function buildTaskManager() {
   return {
     debugSetStepName: emptyMock,
-    instrumentApiFunction: emptyMock,
+    instrumentChromeApiFunction: emptyMock,
   };
 }
 
@@ -23,21 +23,21 @@ var instrumentApiFunction = emptyMock;
 var buildAttemptManager = emptyMock;
 var buildCardSet = emptyMock;
 var emptyListener = {addListener: emptyMock};
-chrome['location'] = {onLocationUpdate: emptyListener};
-chrome['notifications'] = {
+var instrumented = {};
+instrumented['location'] = {onLocationUpdate: emptyListener};
+instrumented['notifications'] = {
   onButtonClicked: emptyListener,
   onClicked: emptyListener,
   onClosed: emptyListener
 };
-chrome['omnibox'] = {onInputEntered: emptyListener};
-chrome['preferencesPrivate'] = {
+instrumented['omnibox'] = {onInputEntered: emptyListener};
+instrumented['preferencesPrivate'] = {
   googleGeolocationAccessEnabled: {
     onChange: emptyListener
   }
 };
-chrome['runtime'] = {
+instrumented['runtime'] = {
   onInstalled: emptyListener,
   onStartup: emptyListener
 };
 
-var storage = {};