Fix a bunch of extensions api tests to not hard-code port 1337.

Fixed about 2/3 of the problem tests.  These are the simple cases, where chrome.test.getConfig() can easily solve the problem.

BUG=53632
TEST=ExtensionApiTest.*

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

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

9 files changed, 25 insertions, 25 deletions

diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index a75fc50..d1e78d1 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -18,7 +18,7 @@ class AppBackgroundPageApiTest : public ExtensionApiTest {
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   LoadExtension(test_data_dir_.AppendASCII(
       "app_background_page/app_has_permission"));
@@ -27,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) {
 
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, LacksPermission) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   LoadExtension(test_data_dir_.AppendASCII(
       "app_background_page/app_lacks_permission"));
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
index 41474bc..a7f7abb 100644
--- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc
+++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
@@ -7,6 +7,6 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHR) {
   host_resolver()->AddRule("*.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("cross_origin_xhr")) << message_;
 }
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index f6c963b..a450fe0 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -12,7 +12,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) {
   host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500);
   host_resolver()->AddRule("b.com", "127.0.0.1");
   host_resolver()->AddRule("c.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
   ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
@@ -23,7 +23,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) {
 // (ExecuteScript) tests are de-flakified, reunite this case with it's brethern.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExecuteScriptFileAfterClose) {
   host_resolver()->AddRule("b.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc
index 43f8a38..372b7a6 100644
--- a/chrome/browser/extensions/extension_incognito_apitest.cc
+++ b/chrome/browser/extensions/extension_incognito_apitest.cc
@@ -17,13 +17,13 @@
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) {
-  ASSERT_TRUE(test_server()->Start());
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) {
+  ASSERT_TRUE(StartTestServer());
 
   // Loads a simple extension which attempts to change the title of every page
   // that loads to "modified".
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
-      .AppendASCII("incognito").AppendASCII("content_scripts")));
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("incognito")
+      .AppendASCII("content_scripts")));
 
   // Open incognito window and navigate to test page.
   ui_test_utils::OpenURLOffTheRecord(
@@ -44,23 +44,23 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) {
   EXPECT_TRUE(result);
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoYesScript) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoYesScript) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   // Load a dummy extension. This just tests that we don't regress a
   // crash fix when multiple incognito- and non-incognito-enabled extensions
   // are mixed.
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
-      .AppendASCII("content_scripts").AppendASCII("all_frames")));
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("content_scripts")
+      .AppendASCII("all_frames")));
 
   // Loads a simple extension which attempts to change the title of every page
   // that loads to "modified".
-  ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_.AppendASCII("api_test")
+  ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_
       .AppendASCII("incognito").AppendASCII("content_scripts")));
 
   // Dummy extension #2.
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
+  ASSERT_TRUE(LoadExtension(test_data_dir_
       .AppendASCII("content_scripts").AppendASCII("isolated_world1")));
 
   // Open incognito window and navigate to test page.
@@ -94,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DontCreateIncognitoProfile) {
 // Tests that the APIs in an incognito-enabled extension work properly.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ResultCatcher catcher;
 
@@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) {
 // properly.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoSplitMode) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   // We need 2 ResultCatchers because we'll be running the same test in both
   // regular and incognito mode.
@@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoSplitMode) {
 // events or callbacks.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ResultCatcher catcher;
 
@@ -172,7 +172,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) {
 // Test that opening a popup from an incognito browser window works properly.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoPopup) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ResultCatcher catcher;
 
diff --git a/chrome/browser/extensions/extension_javascript_url_apitest.cc b/chrome/browser/extensions/extension_javascript_url_apitest.cc
index 2b6cf59..7b7e06e 100644
--- a/chrome/browser/extensions/extension_javascript_url_apitest.cc
+++ b/chrome/browser/extensions/extension_javascript_url_apitest.cc
@@ -8,7 +8,7 @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   host_resolver()->AddRule("b.com", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ASSERT_TRUE(RunExtensionTest("tabs/javascript_url_permissions")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index b76a944..760a627 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -51,7 +51,7 @@ class MessageSender : public NotificationObserver {
 
 // Tests that message passing between extensions and content scripts works.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_;
 }
 
diff --git a/chrome/browser/extensions/fragment_navigation_apitest.cc b/chrome/browser/extensions/fragment_navigation_apitest.cc
index aa7bc46..68ca622 100644
--- a/chrome/browser/extensions/fragment_navigation_apitest.cc
+++ b/chrome/browser/extensions/fragment_navigation_apitest.cc
@@ -6,13 +6,13 @@
 
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptFragmentNavigation) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
   const char* extension_name = "content_scripts/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExecuteScriptFragmentNavigation) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
   const char* extension_name = "executescript/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
diff --git a/chrome/browser/extensions/isolated_world_apitest.cc b/chrome/browser/extensions/isolated_world_apitest.cc
index 4b0761d..6a71b5b 100644
--- a/chrome/browser/extensions/isolated_world_apitest.cc
+++ b/chrome/browser/extensions/isolated_world_apitest.cc
@@ -7,7 +7,7 @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IsolatedWorld1) {
   // This extension runs various bits of script and tests that they all run in
   // the same isolated world.
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("content_scripts/isolated_world1")) << message_;
 
   // Now load a different extension, inject into same page, verify worlds aren't
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 8ff06d7..6853f65 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -51,7 +51,7 @@ void WaitForTabsAndPopups(Browser* browser, int num_tabs, int num_popups) {
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingExtension) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(StartTestServer());
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("popup_blocking")