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

chrome/browser/resources/google_now/background_unittest.gtestjs

 // 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.
 
 /**
  * Test fixture for background.js.
  * @constructor
  * @extends {testing.Test}
  */
 function GoogleNowBackgroundUnitTest () {
@@ skipping 43 matching lines @@
  */
 function mockInitializeDependencies(fixture) {
   fixture.makeAndRegisterMockGlobals([
     'recordEvent',
     'showWelcomeToast',
     'startPollingCards'
   ]);
   fixture.makeAndRegisterMockApis([
     'authenticationManager.isSignedIn',
     'chrome.location.clearWatch',
-    'chrome.notifications.getAll',
-    'chrome.preferencesPrivate.googleGeolocationAccessEnabled.get',
-    'storage.get',
-    'storage.set',
+    'chrome.storage.local.set',
+    'instrumented.notifications.getAll',
+    'instrumented.preferencesPrivate.googleGeolocationAccessEnabled.get',
+    'instrumented.storage.local.get',
     'tasks.add',
     'updateCardsAttempts.isRunning',
     'updateCardsAttempts.stop'
   ]);
 }
 
 /**
  * Sets up the test to expect the state machine calls and send
  * the specified state machine state. Currently used to test initialize().
  * Note that this CAN NOT be used if any of the methods below are called
@@ skipping 14 matching lines @@
   mockApisObj.expects(once()).
       authenticationManager_isSignedIn(
           authenticationManagerIsSignedInSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           authenticationManagerIsSignedInSavedArgs,
           0,
           testIdentityToken));
 
   var googleGeolocationPrefGetSavedArgs = new SaveMockArguments();
   mockApisObj.expects(once()).
-      chrome_preferencesPrivate_googleGeolocationAccessEnabled_get(
+      instrumented_preferencesPrivate_googleGeolocationAccessEnabled_get(
           googleGeolocationPrefGetSavedArgs.match(eqJSON({})),
           googleGeolocationPrefGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(
           googleGeolocationPrefGetSavedArgs, 1, {value: testGeolocationPref}));
 
   var storageGetSavedArgs = new SaveMockArguments();
   mockApisObj.expects(once()).
-      storage_get(
+      instrumented_storage_local_get(
           storageGetSavedArgs.match(eq('userRespondedToToast')),
           storageGetSavedArgs.match(ANYTHING)).
       will(invokeCallback(storageGetSavedArgs, 1, testUserRespondedToToast));
 }
 
 /**
  * Sets up the test to expect the initialization calls that
  * initialize() invokes.
  * Note that this CAN NOT be used if any of the methods below are called
  * outside of this context with the same argument matchers.
  * expects() calls cannot be chained with the same argument matchers.
  */
 function expectInitialization(mockApisObj) {
   mockApisObj.expects(once()).
       chrome_location_clearWatch(ANYTHING);
   mockApisObj.expects(once()).
       updateCardsAttempts_stop();
   mockApisObj.expects(once()).
-      storage_set(eqJSON({notificationsData: {}}));
+      chrome_storage_local_set(eqJSON({notificationsData: {}}));
   var tasksAddSavedArgs = new SaveMockArguments();
   mockApisObj.expects(once()).
       tasks_add(
           tasksAddSavedArgs.match(ANYTHING),
           tasksAddSavedArgs.match(ANYTHING)).
       will(invokeCallback(tasksAddSavedArgs, 1, function() {}));
   var updateCardsAttemptsIsRunningSavedArgs = new SaveMockArguments();
   mockApisObj.expects(once()).
       updateCardsAttempts_isRunning(
           updateCardsAttemptsIsRunningSavedArgs.match(ANYTHING)).
@@ skipping 27 matching lines @@
       expectInitialization(this.mockApis);
 
       expectStateMachineCalls(
           this.mockApis,
           testIdentityToken,
           testGeolocationPref,
           testUserRespondedToToast);
 
       var chromeNotificationGetAllSavedArgs = new SaveMockArguments();
       this.mockApis.expects(exactly(2)).
-          chrome_notifications_getAll(
+          instrumented_notifications_getAll(
               chromeNotificationGetAllSavedArgs.match(ANYTHING)).
           will(
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}),
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}));
 
       // TODO(robliao,vadimt): Determine the granularity of testing to perform.
 
       // Invoking the tested function.
       initialize();
     });
@@ skipping 23 matching lines @@
       expectInitialization(this.mockApis);
 
       expectStateMachineCalls(
           this.mockApis,
           testIdentityToken,
           testGeolocationPref,
           testUserRespondedToToast);
 
       var chromeNotificationGetAllSavedArgs = new SaveMockArguments();
       this.mockApis.expects(exactly(2)).
-          chrome_notifications_getAll(
+          instrumented_notifications_getAll(
               chromeNotificationGetAllSavedArgs.match(ANYTHING)).
           will(
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}),
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}));
 
       // Invoking the tested function.
       initialize();
     });
 
 TEST_F(
@@ skipping 18 matching lines @@
       expectInitialization(this.mockApis);
 
       expectStateMachineCalls(
           this.mockApis,
           testIdentityToken,
           testGeolocationPref,
           testUserRespondedToToast);
 
       var chromeNotificationGetAllSavedArgs = new SaveMockArguments();
       this.mockApis.expects(exactly(2)).
-          chrome_notifications_getAll(
+          instrumented_notifications_getAll(
               chromeNotificationGetAllSavedArgs.match(ANYTHING)).
           will(
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}),
               invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}));
 
       this.mockGlobals.expects(once()).showWelcomeToast();
 
       // Invoking the tested function.
       initialize();
     });
@@ skipping 16 matching lines @@
   expectInitialization(this.mockApis);
 
   expectStateMachineCalls(
       this.mockApis,
       testIdentityToken,
       testGeolocationPref,
       testUserRespondedToToast);
 
   var chromeNotificationGetAllSavedArgs = new SaveMockArguments();
   this.mockApis.expects(exactly(2)).
-      chrome_notifications_getAll(
+      instrumented_notifications_getAll(
           chromeNotificationGetAllSavedArgs.match(ANYTHING)).
       will(
           invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}),
           invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}));
 
   this.mockGlobals.expects(once()).startPollingCards();
 
   // Invoking the tested function.
   initialize();
 });
@@ skipping 19 matching lines @@
   expectInitialization(this.mockApis);
 
   expectStateMachineCalls(
       this.mockApis,
       testIdentityToken,
       testGeolocationPref,
       testUserRespondedToToast);
 
   var chromeNotificationGetAllSavedArgs = new SaveMockArguments();
   this.mockApis.expects(exactly(2)).
-      chrome_notifications_getAll(
+      instrumented_notifications_getAll(
           chromeNotificationGetAllSavedArgs.match(ANYTHING)).
       will(
           invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}),
           invokeCallback(chromeNotificationGetAllSavedArgs, 0, {}));
 
   // Invoking the tested function.
   initialize();
 });
 
 /**
  * Mocks global functions and APIs that onNotificationClicked() depends upon.
  * @param {Test} fixture Test fixture.
  */
 function mockOnNotificationClickedDependencies(fixture) {
   fixture.makeAndRegisterMockApis([
-      'storage.get',
-      'chrome.tabs.create',
-      'chrome.windows.create']);
+      'chrome.windows.create',
+      'instrumented.storage.local.get',
+      'instrumented.tabs.create']);
 }
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_NoData',
     function() {
       // Tests the case when there is no data associated with notification id.
       // In this case, the function should do nothing.
 
       // Setup and expectations.
       var testNotificationId = 'TEST_ID';
       var testNotificationData = {};
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
       var storageGetSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          storage_get(
+          instrumented_storage_local_get(
               storageGetSavedArgs.match(eq('notificationsData')),
               storageGetSavedArgs.match(ANYTHING)).
           will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
     'GoogleNowBackgroundUnitTest',
     'OnNotificationClicked_ActionUrlsNotObject',
     function() {
       // Tests the case when the data associated with notification id is not an
       // object, probably because of a malformed server response.
       // In this case, the function should do nothing.
 
       // Setup and expectations.
       var testActionUrls = 'string, not object';
       var testNotificationId = 'TEST_ID';
       var testNotificationData = {
           notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
       var storageGetSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          storage_get(
+          instrumented_storage_local_get(
               storageGetSavedArgs.match(eq('notificationsData')),
               storageGetSavedArgs.match(ANYTHING)).
           will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
@@ skipping 10 matching lines @@
       var testNotificationData = {
           notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
       var testActionUrl = {};
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
       var storageGetSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          storage_get(
+          instrumented_storage_local_get(
               storageGetSavedArgs.match(eq('notificationsData')),
               storageGetSavedArgs.match(ANYTHING)).
           will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
       this.mockLocalFunctions.expects(once()).selector(testActionUrls).will(
           returnValue(testActionUrl));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
@@ skipping 11 matching lines @@
           notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
       var testActionUrl = 'http://testurl.com';
       var testCreatedTab = {};
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
       var storageGetSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          storage_get(
+          instrumented_storage_local_get(
               storageGetSavedArgs.match(eq('notificationsData')),
               storageGetSavedArgs.match(ANYTHING)).
           will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
       this.mockLocalFunctions.expects(once()).selector(testActionUrls).will(
           returnValue(testActionUrl));
       var chromeTabsCreateSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          chrome_tabs_create(
+          instrumented_tabs_create(
               chromeTabsCreateSavedArgs.match(eqJSON({url: testActionUrl})),
               chromeTabsCreateSavedArgs.match(ANYTHING)).
           will(invokeCallback(chromeTabsCreateSavedArgs, 1, testCreatedTab));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });
 
 TEST_F(
@@ skipping 11 matching lines @@
         notificationsData: {'TEST_ID': {actionUrls: testActionUrls}}
       };
       var testActionUrl = 'http://testurl.com';
       var testCreatedTab = undefined; // chrome.tabs.create fails
 
       mockOnNotificationClickedDependencies(this);
       this.makeMockLocalFunctions(['selector']);
 
       var storageGetSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          storage_get(
+          instrumented_storage_local_get(
               storageGetSavedArgs.match(eq('notificationsData')),
               storageGetSavedArgs.match(ANYTHING)).
           will(invokeCallback(storageGetSavedArgs, 1, testNotificationData));
       this.mockLocalFunctions.expects(once()).selector(testActionUrls).will(
           returnValue(testActionUrl));
       var chromeTabsCreateSavedArgs = new SaveMockArguments();
       this.mockApis.expects(once()).
-          chrome_tabs_create(
+          instrumented_tabs_create(
               chromeTabsCreateSavedArgs.match(eqJSON({url: testActionUrl})),
               chromeTabsCreateSavedArgs.match(ANYTHING)).
           will(invokeCallback(chromeTabsCreateSavedArgs, 1, testCreatedTab));
       this.mockApis.expects(once()).chrome_windows_create(
           eqJSON({url: testActionUrl}));
 
       // Invoking the tested function.
       onNotificationClicked(
           testNotificationId, this.mockLocalFunctions.functions().selector);
     });