DevTools: report redirect responses only if response interception is enabled

We previously reported redirect responses when the "Request" interception
stage was enabled. Since they technically are responses, we will now report
them only when the "HeadersReceived" stage is enabled.

Change-Id: I5318f8b4167b662d11852b8d93bff4b9db960c8d
Reviewed-on: https://chromium-review.googlesource.com/1147507Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577366}

content/browser/devtools/devtools_url_interceptor_request_job.cc

@@ -799,8 +799,7 @@ void DevToolsURLInterceptorRequestJob::OnSubRequestRedirectReceived(
 
   // If we're not intercepting results or are a response then cancel this
   // redirect and tell the parent request it was redirected through |redirect_|.
-  if (stage_to_intercept_ == InterceptionStage::DONT_INTERCEPT ||
-      stage_to_intercept_ == InterceptionStage::RESPONSE) {
+  if (!(stage_to_intercept_ & InterceptionStage::RESPONSE)) {
     *defer_redirect = false;
     ProcessRedirect(redirectinfo.status_code, redirectinfo.new_url.spec());
     redirect_.reset();

content/browser/devtools/devtools_url_loader_interceptor.cc

@@ -1209,7 +1209,7 @@ void InterceptionJob::OnReceiveRedirect(
   response_metadata_->redirect_info =
       std::make_unique<net::RedirectInfo>(redirect_info);
 
-  if (!(stage_ & InterceptionStage::REQUEST)) {
+  if (!(stage_ & InterceptionStage::RESPONSE)) {
     client_->OnReceiveRedirect(redirect_info, head);
     return;
   }

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/interception-mocked-redirect-chain.js

@@ -10,11 +10,6 @@
 
   await dp.Network.setRequestInterception({patterns: [{}]});
 
-  // Automatically proceed with redirect interceptions.
-  dp.Network.onRequestIntercepted(event => {
-    if (event.params.request.redirectUrl)
-      dp.Network.continueInterceptedRequest({interceptionId: event.params.interceptionId});
-  });
   session.navigate('http://test-url/');
 
   let params = (await dp.Network.onceRequestIntercepted()).params;

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-blocked-expected.txt

@@ -9,8 +9,6 @@ allowRequest ID 1
 Network.responseReceived redirect-iframe.html 200 text/html
 Network.requestIntercepted ID 2 GET redirect1.pl type: Script
 allowRequest ID 2
-Network.requestIntercepted ID 2 307 redirect redirect1.pl -> redirect2.pl
-allowRequest ID 2
 Network.requestIntercepted ID 3 GET redirect2.pl type: Script
 blockRequest ID 3 AddressUnreachable
 Network.loadingFailed redirect2.pl net::ERR_ADDRESS_UNREACHABLE

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-both-expected.txt

+Tests interception of redirects.
+Test started
+Network agent enabled
+Request interception enabled
+Page agent enabled
+Runtime agent enabled
+Network.requestIntercepted ID 1 GET redirect-iframe.html type: Document
+allowRequest ID 1
+Network.requestIntercepted ID 1 GET redirect-iframe.html type: Document
+allowRequest ID 1
+Network.responseReceived redirect-iframe.html 200 text/html
+Network.requestIntercepted ID 2 GET redirect1.pl type: Script
+allowRequest ID 2
+Network.requestIntercepted ID 2 307 redirect redirect1.pl -> redirect2.pl
+allowRequest ID 2
+Network.requestIntercepted ID 3 GET redirect2.pl type: Script
+allowRequest ID 3
+Network.requestIntercepted ID 3 302 redirect redirect2.pl -> redirect3.pl
+allowRequest ID 3
+Network.requestIntercepted ID 4 GET redirect3.pl type: Script
+allowRequest ID 4
+Network.requestIntercepted ID 4 301 redirect redirect3.pl -> final.js
+allowRequest ID 4
+Network.requestIntercepted ID 5 GET final.js type: Script
+allowRequest ID 5
+Network.requestIntercepted ID 5 GET final.js type: Script
+allowRequest ID 5
+Network.responseReceived final.js 200 application/x-javascript
+Page.frameStoppedLoading
+Hello from final.js!
+

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-both.js

+(async function(testRunner) {
+  var {page, session, dp} = await testRunner.startBlank(
+      `Tests interception of redirects.`);
+
+  var InterceptionHelper = await testRunner.loadScript('../resources/interception-test.js');
+  var helper = new InterceptionHelper(testRunner, session);
+
+  var requestInterceptedDict = {
+    'redirect-iframe.html': event => helper.allowRequest(event),
+    'redirect1.pl': event => helper.allowRequest(event),
+    'redirect2.pl': event => helper.allowRequest(event),
+    'redirect3.pl': event => helper.allowRequest(event),
+    'final.js': event => helper.allowRequest(event),
+  };
+
+  await helper.startInterceptionTest(requestInterceptedDict, 1, 'Both');
+  session.evaluate(`
+    var iframe = document.createElement('iframe');
+    iframe.src = '${testRunner.url('./resources/redirect-iframe.html')}';
+    document.body.appendChild(iframe);
+  `);
+})

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-expected.txt

@@ -9,16 +9,10 @@ allowRequest ID 1
 Network.responseReceived redirect-iframe.html 200 text/html
 Network.requestIntercepted ID 2 GET redirect1.pl type: Script
 allowRequest ID 2
-Network.requestIntercepted ID 2 307 redirect redirect1.pl -> redirect2.pl
-allowRequest ID 2
 Network.requestIntercepted ID 3 GET redirect2.pl type: Script
 allowRequest ID 3
-Network.requestIntercepted ID 3 302 redirect redirect2.pl -> redirect3.pl
-allowRequest ID 3
 Network.requestIntercepted ID 4 GET redirect3.pl type: Script
 allowRequest ID 4
-Network.requestIntercepted ID 4 301 redirect redirect3.pl -> final.js
-allowRequest ID 4
 Network.requestIntercepted ID 5 GET final.js type: Script
 allowRequest ID 5
 Network.responseReceived final.js 200 application/x-javascript

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-mocked-expected.txt

@@ -9,12 +9,8 @@ allowRequest ID 1
 Network.responseReceived redirect-iframe.html 200 text/html
 Network.requestIntercepted ID 2 GET redirect1.pl type: Script
 allowRequest ID 2
-Network.requestIntercepted ID 2 307 redirect redirect1.pl -> redirect2.pl
-allowRequest ID 2
 Network.requestIntercepted ID 3 GET redirect2.pl type: Script
 allowRequest ID 3
-Network.requestIntercepted ID 3 302 redirect redirect2.pl -> redirect3.pl
-allowRequest ID 3
 Network.requestIntercepted ID 4 GET redirect3.pl type: Script
 mockResponse ID 4
 Network.responseReceived redirect3.pl 200 application/javascript

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/network/redirect-interception-modified-expected.txt

@@ -9,12 +9,8 @@ allowRequest ID 1
 Network.responseReceived redirect-iframe.html 200 text/html
 Network.requestIntercepted ID 2 GET redirect1.pl type: Script
 allowRequest ID 2
-Network.requestIntercepted ID 2 307 redirect redirect1.pl -> redirect2.pl
-allowRequest ID 2
 Network.requestIntercepted ID 3 GET redirect2.pl type: Script
 allowRequest ID 3
-Network.requestIntercepted ID 3 302 redirect redirect2.pl -> redirect3.pl
-allowRequest ID 3
 Network.requestIntercepted ID 4 GET redirect3.pl type: Script
 modifyRequest ID 4: url redirect3.pl -> alternative.js
 Network.responseReceived redirect3.pl 200 application/x-javascript