Updated Google Now to Check the Geolocation Access Preference

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 {instrumentApiFunction: emptyMock};
+  return {
+    debugSetStepName: emptyMock,
+    instrumentApiFunction: emptyMock,
+  };
 }
 var instrumentApiFunction = emptyMock;
 var buildAttemptManager = emptyMock;
 var emptyListener = {addListener: emptyMock};
-chrome['location'] = {onLocationUpdate: emptyListener};
+chrome['location'] = {
+  onLocationUpdate: emptyListener,

[xiyuan, 2013/07/26 17:24:51]

nit: The change seems to be unnecessary.

[robliao, 2013/07/26 19:04:32]

Done.

+};
 chrome['notifications'] = {
   onButtonClicked: emptyListener,
   onClicked: emptyListener,
   onClosed: emptyListener
 };
 chrome['omnibox'] = {onInputEntered: emptyListener};
+chrome['preferencesPrivate'] = {
+  googleGeolocationAccessEnabled: {
+    onChange: emptyListener
+  }
+};
 chrome['runtime'] = {
   onInstalled: emptyListener,
   onStartup: emptyListener
 };
 
 var storage = {};
 
 /**
  * Syntactic sugar for use with will() on a Mock4JS.Mock.
  * Creates an action for will() that invokes a callback that the tested code
  * passes to a mocked function.
  * @param {SaveMockArguments} savedArgs Arguments that will contain the
  *     callback once the mocked function is called.
  * @param {number} callbackParameter Index of the callback parameter in
  *     |savedArgs|.
  * @param {...Object} var_args Arguments to pass to the callback.
  * @return {CallFunctionAction} Action for use in will().
  */
 function invokeCallback(savedArgs, callbackParameter, var_args) {
   var callbackArguments = Array.prototype.slice.call(arguments, 2);
   return callFunction(function() {
     savedArgs.arguments[callbackParameter].apply(null, callbackArguments);
+
+    // Mock4JS does not clear the saved args after invocation.
+    // To allow reuse of the same SaveMockArguments for multiple
+    // invocations with similar arguments, clear them here.
+    savedArgs.arguments.splice(0, savedArgs.arguments.length);
   });
 }
 
 /**
   * Mock4JS matcher object that matches the actual agrument and the expected
   * value iff their JSON represenations are same.
   * @param {Object} expectedValue Expected value.
   * @constructor
   */
 function MatchJSON(expectedValue) {
@@ skipping 22 matching lines @@
 };
 
 /**
   * Builds a MatchJSON agrument matcher for a given expected value.
   * @param {Object} expectedValue Expected value.
   * @return {MatchJSON} Resulting Mock4JS matcher.
   */
 function eqJSON(expectedValue) {
   return new MatchJSON(expectedValue);
 }