summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 17:34:53 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-06 17:34:53 +0000
commitb8dd619aa87b909ca80c2684485b393e03db9dcc (patch)
treeee3326525c1e7d1926851d0cf9009291ad666bf8 /chrome_frame/test
parentd60c79650e1be14bb75b25362b2eadd0c76b48ba (diff)
downloadchromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.zip
chromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.tar.gz
chromium_src-b8dd619aa87b909ca80c2684485b393e03db9dcc.tar.bz2
Revert 70618 - First pass at adding http/backend cache events to the NetLog.
Adds sources and events for ActiveCacheEntry and EntryImpl objects, as well as adding cache read/write events to HttpCacheTransactions. Most new read/write events are only logged when NetLog logging mode is set to log all events. Also, net-internals now merges begin and end events that have parameters, as long as only one of them has parameters. I think this increases readability, at the cost of making it a little more difficult to follow timings with just the "st" values. BUG=59382 TEST=none yet, other than updates to existing tests. Review URL: http://codereview.chromium.org/4067002 TBR=mmenke@chromium.org Review URL: http://codereview.chromium.org/6005015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/test_server_test.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 9040e22..0bb9ba2 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -81,7 +81,6 @@ class URLRequestTestContext : public URLRequestContext {
http_auth_handler_factory_,
NULL /* network_delegate */,
NULL /* net_log */),
- NULL /* net_log */,
net::HttpCache::DefaultBackend::InMemory(0));
// In-memory cookie store.
cookie_store_ = new net::CookieMonster(NULL, NULL);