[Devtools] Overrides now intercept from response stage

To get better mime-types we now intercept response info for overrides at
the response stage.

R=pfeldman
BUG=760316

Change-Id: I6f0367ef2789d210c51dc1c39130e4a72106b05b
Reviewed-on: https://chromium-review.googlesource.com/780922
Commit-Queue: Blaise Bruer <allada@chromium.org>
Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518800}

third_party/WebKit/LayoutTests/http/tests/devtools/network/disable-cache-on-interception.js

@@ -8,7 +8,7 @@
   Common.moduleSetting('cacheDisabled').addChangeListener(cacheSettingChanged);
 
   TestRunner.addResult('Enabling Interception');
-  await SDK.multitargetNetworkManager.setInterceptionHandlerForPatterns(['*'], () => Promise.resolve());
+  await SDK.multitargetNetworkManager.setInterceptionHandlerForPatterns([{urlPattern: '*'}], () => Promise.resolve());
   TestRunner.addResult('Interception Enabled');
   TestRunner.completeTest();
 

third_party/WebKit/LayoutTests/http/tests/devtools/sdk/network-interception-wildcard-pattern-matching.js

@@ -26,7 +26,7 @@
    */
   async function checkPattern(pattern) {
     TestRunner.addResult("Setting Pattern: " + cleanURLOrPattern(pattern));
-    await SDK.multitargetNetworkManager.setInterceptionHandlerForPatterns([pattern], interceptionHandler);
+    await SDK.multitargetNetworkManager.setInterceptionHandlerForPatterns([{urlPattern: pattern}], interceptionHandler);
     TestRunner.addResult("Requesting: " + cleanURLOrPattern(resourceURL));
     await TestRunner.evaluateInPageAsync(`fetch('` + resourceURL + `')`);
     TestRunner.addResult("Response Received: " + cleanURLOrPattern(resourceURL));

third_party/WebKit/Source/devtools/front_end/persistence/NetworkPersistenceManager.js

@@ -390,7 +390,10 @@ Persistence.NetworkPersistenceManager = class extends Common.Object {
       }
 
       return SDK.multitargetNetworkManager.setInterceptionHandlerForPatterns(
-          Array.from(patterns), this._interceptionHandlerBound);
+          Array.from(patterns).map(
+              pattern =>
+                  ({urlPattern: pattern, interceptionStage: Protocol.Network.InterceptionStage.HeadersReceived})),
+          this._interceptionHandlerBound);
     }
   }
 
@@ -457,10 +460,18 @@ Persistence.NetworkPersistenceManager = class extends Common.Object {
     if (!fileSystemUISourceCode)
       return;
 
-    var expectedResourceType = Common.resourceTypes[interceptedRequest.resourceType] || Common.resourceTypes.Other;
-    var mimeType = fileSystemUISourceCode.mimeType();
-    if (Common.ResourceType.fromMimeType(mimeType) !== expectedResourceType)
-      mimeType = expectedResourceType.canonicalMimeType();
+    var mimeType = '';
+    if (interceptedRequest.responseHeaders) {
+      var responseHeaders = SDK.NetworkManager.lowercaseHeaders(interceptedRequest.responseHeaders);
+      mimeType = responseHeaders['content-type'];
+    }
+
+    if (!mimeType) {
+      var expectedResourceType = Common.resourceTypes[interceptedRequest.resourceType] || Common.resourceTypes.Other;
+      mimeType = fileSystemUISourceCode.mimeType();
+      if (Common.ResourceType.fromMimeType(mimeType) !== expectedResourceType)
+        mimeType = expectedResourceType.canonicalMimeType();
+    }
     var project = /** @type {!Persistence.FileSystemWorkspaceBinding.FileSystem} */ (fileSystemUISourceCode.project());
     var blob = await project.requestFileBlob(fileSystemUISourceCode);
     interceptedRequest.continueRequestWithContent(new Blob([blob], {type: mimeType}));

third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js

@@ -147,7 +147,7 @@ SDK.NetworkManager = class extends SDK.SDKModel {
    * @param {!Object} headers
    * @return {!Object<string, string>}
    */
-  static _lowercaseHeaders(headers) {
+  static lowercaseHeaders(headers) {
     var newHeaders = {};
     for (var headerName in headers)
       newHeaders[headerName.toLowerCase()] = headers[headerName];
@@ -448,7 +448,7 @@ SDK.NetworkDispatcher = class {
    */
   responseReceived(requestId, loaderId, time, resourceType, response, frameId) {
     var networkRequest = this._inflightRequestsById[requestId];
-    var lowercaseHeaders = SDK.NetworkManager._lowercaseHeaders(response.headers);
+    var lowercaseHeaders = SDK.NetworkManager.lowercaseHeaders(response.headers);
     if (!networkRequest) {
       // We missed the requestWillBeSent.
       var eventData = {};
@@ -798,7 +798,7 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
     this._effectiveBlockedURLs = [];
     this._updateBlockedPatterns();
 
-    /** @type {!Multimap<!SDK.MultitargetNetworkManager.RequestInterceptor, string>} */
+    /** @type {!Multimap<!SDK.MultitargetNetworkManager.RequestInterceptor, !SDK.MultitargetNetworkManager.InterceptionPattern>} */
     this._urlsForRequestInterceptor = new Multimap();
 
     SDK.targetManager.observeTargets(this, SDK.Target.Capability.Network);
@@ -829,10 +829,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
       networkAgent.setUserAgentOverride(this._currentUserAgent());
     if (this._effectiveBlockedURLs.length)
       networkAgent.setBlockedURLs(this._effectiveBlockedURLs);
-    if (this.isIntercepting()) {
-      networkAgent.setRequestInterception(
-          this._urlsForRequestInterceptor.valuesArray().map(pattern => ({urlPattern: pattern})));
-    }
+    if (this.isIntercepting())
+      networkAgent.setRequestInterception(this._urlsForRequestInterceptor.valuesArray());
     this._agents.add(networkAgent);
     if (this.isThrottling())
       this._updateNetworkConditions(networkAgent);
@@ -1007,7 +1005,7 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   }
 
   /**
-   * @param {!Array<string>} patterns
+   * @param {!Array<!SDK.MultitargetNetworkManager.InterceptionPattern>} patterns
    * @param {!SDK.MultitargetNetworkManager.RequestInterceptor} requestInterceptor
    * @return {!Promise}
    */
@@ -1037,11 +1035,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
       Common.moduleSetting('cacheDisabled').set(true);
     this._updatingInterceptionPatternsPromise = null;
     var promises = /** @type {!Array<!Promise>} */ ([]);
-    for (var agent of this._agents) {
-      // We do not allow '?' as a single character wild card for now and do not support '*' either.
-      var patterns = this._urlsForRequestInterceptor.valuesArray().map(pattern => ({urlPattern: pattern}));
-      promises.push(agent.setRequestInterception(this.isIntercepting() ? patterns : []));
-    }
+    for (var agent of this._agents)
+      promises.push(agent.setRequestInterception(this._urlsForRequestInterceptor.valuesArray()));
     this.dispatchEventToListeners(SDK.MultitargetNetworkManager.Events.InterceptorsChanged);
     return Promise.all(promises);
   }
@@ -1196,6 +1191,9 @@ SDK.MultitargetNetworkManager.InterceptedRequest = class {
   }
 };
 
+/** @typedef {!{urlPattern: string, interceptionStage: !Protocol.Network.InterceptionStage}} */
+SDK.MultitargetNetworkManager.InterceptionPattern;
+
 /** @typedef {!function(!SDK.MultitargetNetworkManager.InterceptedRequest):!Promise} */
 SDK.MultitargetNetworkManager.RequestInterceptor;