Fix callback for chrome.tabs.update with javascript URLs.

UpdateTabFunction is asynchronous when updating a tab with a javascript URL. In this situation, the method was returning early before generating the callback result. This fixes the ExecuteScriptApiTest.NavigationRaceJavaScriptUrl test.

BUG=89731
TEST=ExecuteScriptApiTest.NavigationRaceJavaScriptUrl

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

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

1 files changed, 12 insertions, 4 deletions

diff --git a/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.js b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.js
index d35d1b1..104dc2b 100644
--- a/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.js
+++ b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.js
@@ -1,9 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
+var assertEq = chrome.test.assertEq;
+var pass = chrome.test.callbackPass;
+
 chrome.test.getConfig(function(config) {
-  var javaScriptURL = "javascript:void(document.body.bgColor='red')";
+  var javaScriptURL = "javascript:void(document.title='js-url-success')";
 
   var fixPort = function(url) {
     return url.replace(/PORT/, config.testServer.port);
@@ -26,8 +29,13 @@ chrome.test.getConfig(function(config) {
         },
 
         function javaScriptURLShouldSucceed() {
-          chrome.tabs.update(secondTabId, {url: javaScriptURL},
-              chrome.test.callbackPass());
+          chrome.tabs.update(
+              secondTabId,
+              {url: javaScriptURL},
+              pass(function(tab) {
+            assertEq(secondTabId, tab.id);
+            assertEq('js-url-success', tab.title);
+          }));
         }
       ]);
     });