diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 20:59:05 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 20:59:05 +0000 |
| commit | c1dffe83ba4c933b6e5a87edc92780eda101b2b4 (patch) | |
| tree | 869a9fedc1763f15ec6ed974c6c815050601d898 /chrome/browser/extensions/extension_tabs_apitest.cc | |
| parent | 3a4ddfce956ad9e8f6a47ddee43e779c36443c88 (diff) | |
| download | chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.zip chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.tar.gz chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.tar.bz2 | |
GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1
This eliminates a whole class of problems with SpawnedTestServer
failing to start.
BUG=96594, 98194
R=asargent@chromium.org, rsleevi@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/16268017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 128e0b3..d42c4be 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabGetCurrent) { // Flaky on the trybots. See http://crbug.com/96725. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabConnect) { - ASSERT_TRUE(StartTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; } @@ -156,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabReload) { IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabJpeg) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); - ASSERT_TRUE(StartTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", "test_jpeg.html")) << message_; } @@ -164,7 +164,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabJpeg) { IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabPng) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); - ASSERT_TRUE(StartTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", "test_png.html")) << message_; } |