Don't allow updating tabs to javascript URLs without host

permissions to that tab.

Cleaned up a few things along the way:

- added a GetExtension() method to
  ExtensionFunctionDispatcher and ExtensionFunction since it
  was used in more than one place.

- Removed first param from chrome.test.failCallback() since
  it wasn't used anywhere.

- Added a convenience CanAccessHost() method to Extension,
  since it seems likely to be commonly used.

- Refactored setup of mock host resolver in browsertest,
  since the way it was, you could only customize it at the
  testsuite level, not the test level.

Review URL: http://codereview.chromium.org/199074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25971 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 4 deletions

diff --git a/chrome/renderer/resources/extension_apitest.js b/chrome/renderer/resources/extension_apitest.js
index 9e4ed5e..7b2d583 100644
--- a/chrome/renderer/resources/extension_apitest.js
+++ b/chrome/renderer/resources/extension_apitest.js
@@ -151,8 +151,12 @@ var chrome = chrome || {};
   // Wrapper for generating test functions, that takes care of calling
   // assertNoLastError() and (optionally) succeed() for you.
   chrome.test.callback = function(func, expectedError) {
-    chrome.test.assertEq(typeof(func), 'function');
+    if (func) {
+      chrome.test.assertEq(typeof(func), 'function');
+    }
+
     callbackAdded();
+
     return function() {
       if (expectedError == null) {
         chrome.test.assertNoLastError();
@@ -160,7 +164,11 @@ var chrome = chrome || {};
         chrome.test.assertEq(typeof(expectedError), 'string');
         chrome.test.assertEq(expectedError, chrome.extension.lastError.message);
       }
-      safeFunctionApply(func, arguments);
+      
+      if (func) {
+        safeFunctionApply(func, arguments);
+      }
+
       callbackCompleted();
     };
   };
@@ -179,8 +187,8 @@ var chrome = chrome || {};
     return chrome.test.callback(func);
   };
 
-  chrome.test.callbackFail = function(func, expectedError) {
-    return chrome.test.callback(func, expectedError);
+  chrome.test.callbackFail = function(expectedError) {
+    return chrome.test.callback(null, expectedError);
   };
 
   // TODO(erikkay) This is deprecated and should be removed.