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 d50207b1c42a7e8cbcb2ef51cbc07d31c3be111e..3bbf5a4270dcb9eb584a046dd02a73d81984b903 100644 |
--- a/chrome/browser/resources/google_now/background_test_util.js |
+++ b/chrome/browser/resources/google_now/background_test_util.js |
@@ -4,8 +4,6 @@ |
// Mocks for globals needed for loading background.js. |
-function emptyMock() {} |
- |
var wrapper = {instrumentChromeApiFunction: emptyMock}; |
function buildTaskManager() { |
@@ -21,21 +19,14 @@ function buildAuthenticationManager() { |
var instrumentApiFunction = emptyMock; |
var buildAttemptManager = emptyMock; |
var buildCardSet = emptyMock; |
-var emptyListener = {addListener: emptyMock}; |
+ |
var instrumented = {}; |
-instrumented['location'] = {onLocationUpdate: emptyListener}; |
-instrumented['notifications'] = { |
- onButtonClicked: emptyListener, |
- onClicked: emptyListener, |
- onClosed: emptyListener |
-}; |
-instrumented['omnibox'] = {onInputEntered: emptyListener}; |
-instrumented['preferencesPrivate'] = { |
- googleGeolocationAccessEnabled: { |
- onChange: emptyListener |
- } |
-}; |
-instrumented['runtime'] = { |
- onInstalled: emptyListener, |
- onStartup: emptyListener |
-}; |
+mockChromeEvent(instrumented, 'location.onLocationUpdate'); |
+mockChromeEvent(instrumented, 'notifications.onButtonClicked'); |
+mockChromeEvent(instrumented, 'notifications.onClicked'); |
+mockChromeEvent(instrumented, 'notifications.onClosed'); |
+mockChromeEvent(instrumented, 'omnibox.onInputEntered'); |
+mockChromeEvent( |
+ instrumented, 'preferencesPrivate.googleGeolocationAccessEnabled.onChange'); |
+mockChromeEvent(instrumented, 'runtime.onInstalled'); |
+mockChromeEvent(instrumented, 'runtime.onStartup'); |