Rebase two inspector-protocol/network tests following NetworkService being enabled
- interception-take-stream.js is only supposed to work with the network service,
old expectations were for errors reported when it doesn't;
- xhr-interception-auth-fail.js change is due to actually changed semantics -- we
do not prompt for auth when sending XHRs in general, but if worked before
because we used to intercept at the lower level (URLRequestJob vs. URLLoader).
Bug: 933880
Change-Id: I3d0a1cae30b11af3ca50bd64d4123b294e42b59b
Reviewed-on: https://chromium-review.googlesource.com/c/1492046
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Auto-Submit: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636207}diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index 834ac3a..9a7043fb 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -5849,8 +5849,6 @@
# These started failing when network service was enabled by default.
crbug.com/933880 external/wpt/service-workers/service-worker/request-end-to-end.https.html [ Failure ]
-crbug.com/933880 http/tests/inspector-protocol/network/interception-take-stream.js [ Failure ]
-crbug.com/933880 http/tests/inspector-protocol/network/xhr-interception-auth-fail.js [ Failure ]
# This passes in content_shell but not in chrome with network service disabled,
# because content_shell does not add the about: handler. With network service
# enabled this fails in both content_shell and chrome.
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/interception-take-stream-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/network/interception-take-stream-expected.txt
index 750f816..65bd21a 100644
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/interception-take-stream-expected.txt
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/interception-take-stream-expected.txt
@@ -1,29 +1,34 @@
Tests that resource bodies can be taken as streams.
Running test: testBasicUsage
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: The_quick_brown_fox_jumps_over_the_lazy_dog_0123456789The_quick_brown_fox_jumps_over_the_lazy_dog_01 (100) eof: false
+eof: true
Running test: testLargeRead
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: (100000) eof: false
+eof: true
Running test: testSmallNonOverlappingReads
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: (10000)
Running test: testSmallOverlappingReads
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: (100000)
Running test: testRead0
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: (0) eof: false
+data: The_quick_brown_fox_jumps_over_the_lazy_dog_0123456789The_quick_brown_fox_jumps_over_the_lazy_dog_01 (100) eof: false
+eof: true
Running test: testTakeTwice
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+Trying to take stream twice: Can only get response body on requests captured after headers received.
Running test: testReadAfterCancel
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+data: The_quick_brown_fox_jumps_over_the_lazy_dog_0123456789The_quick_brown_fox_jumps_over_the_lazy_dog_01 (100) eof: false
+eof: true
Running test: testContinueAfterBodyTaken
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+Attempting to continue as is after taking request: Unable to continue request as is after body is taken
Running test: testReadAfterClose
-Error taking stream: Network.takeResponseBodyForInterceptionAsStream is only currently supported with --enable-features=NetworkService
+Attempting read after close: Invalid stream handle
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/xhr-interception-auth-fail-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/network/xhr-interception-auth-fail-expected.txt
index 5b6cdc5..75ab74a 100644
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/xhr-interception-auth-fail-expected.txt
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/xhr-interception-auth-fail-expected.txt
@@ -9,8 +9,6 @@
Network.responseReceived xhr-iframe-auth-fail.html 200 text/html
Network.requestIntercepted ID 2 GET unauthorised.pl type: XHR
allowRequest ID 2
-Auth required for ID 2
------ Use Default Auth -----
Network.responseReceived unauthorised.pl 401 text/plain
Page.frameStoppedLoading
xhr.status = 401
