summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 19:28:51 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 19:28:51 +0000
commitabe1c4af50b39d1b83869eae19aa2b5494b5aa0c (patch)
treee1719ec60ba97960b5c00c2df08af8bad8c9f52f /chrome_frame
parente1234c92ae9a58803797b97172631d64f7d41654 (diff)
downloadchromium_src-abe1c4af50b39d1b83869eae19aa2b5494b5aa0c.zip
chromium_src-abe1c4af50b39d1b83869eae19aa2b5494b5aa0c.tar.gz
chromium_src-abe1c4af50b39d1b83869eae19aa2b5494b5aa0c.tar.bz2
net: Rework how blocking delegates are logged.
Switch to logging an event before calling into delegates, and after they return instead of only in the case that they block. This allows delegates to log events as they take turns blocking a network request. Also allows delegates to log events when delaying the start of a request, and when delaying the start of reading the body of a request (But not between normal body reads). Also allows delegates to log delegate information that will not be displayed to the user. BUG=294920 Review URL: https://codereview.chromium.org/25097004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 935b02c..dcfaa4c 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -335,7 +335,13 @@ void FilterDisabledTests() {
"URLRequestTest*.*_GetFullRequestHeaders",
// IE redirects to data: URLs differently.
- "URLRequestTestHTTP.RestrictDataRedirects"
+ "URLRequestTestHTTP.RestrictDataRedirects",
+
+ // Chrome frame doesn't use URLRequestHttpJob, so doesn't call into
+ // NetworkDelegates in OnStartCompleted, unlike Chrome.
+ "URLRequestTestHTTP.NetworkDelegateInfo",
+ "URLRequestTestHTTP.NetworkDelegateInfoAuth",
+ "URLRequestTestHTTP.NetworkDelegateInfoRedirect",
};
const char* ie9_disabled_tests[] = {