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

chrome/browser/resources/google_now/background_test_util.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.
 
 // Mocks for globals needed for loading background.js.
 
 function emptyMock() {}
 
 function buildTaskManager() {
   return {
     debugSetStepName: emptyMock,
-    instrumentApiFunction: emptyMock,
+    instrumentChromeApiFunction: emptyMock,
   };
 }
 
 function buildAuthenticationManager() {
   return {
     addListener: emptyMock
   };
 }
 
 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 = {};