summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 12:16:02 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 12:16:02 +0000
commitbfe8b306948495ef20d0f974b67411059520c409 (patch)
tree49113eff58e039314c544b22419b02df57e9f07f /net
parentd53b97b1bd36d3fc4c132535670b363e94186432 (diff)
downloadchromium_src-bfe8b306948495ef20d0f974b67411059520c409.zip
chromium_src-bfe8b306948495ef20d0f974b67411059520c409.tar.gz
chromium_src-bfe8b306948495ef20d0f974b67411059520c409.tar.bz2
Re-enable URLRequestTestHTTP.NetworkDelegateCancelWhileWaiting4.
If *only* this test "fails" because of the log parsing, the tree won't be closed. The test will show as failed in the test run step though. BUG=158130 TBR=battre Review URL: https://codereview.chromium.org/12230056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 9a9a718..4f223e5 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -2725,8 +2725,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting3) {
// Tests that we can handle when a network request was canceled while we were
// waiting for the network delegate.
// Part 4: Request is cancelled while waiting for OnAuthRequired callback.
-// Disabled: crbug.com/158130.
-TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateCancelWhileWaiting4) {
+TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting4) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;