Cleanup in handling of JavaScript URLs in tabs API

Reuse infrastructure for chrome.tabs.executeScript() to
implement chrome.tabs.update({url:"javascript:...."}) since
it has built-in safeguards against navigation races.

BUG=77026

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

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

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 8295ca4..c12a4e0 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -46,3 +46,13 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
   const char* extension_name = "executescript/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRace) {
+  host_resolver()->AddRule("a.com", "127.0.0.1");
+  host_resolver()->AddRule("b.com", "127.0.0.1");
+  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
+                                  "execute_script.html")) << message_;
+  ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
+                                  "javascript_url.html")) << message_;
+}