diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:39:04 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:39:04 +0000 |
| commit | a6ec0897e904792a60a12a58b26dd2214dbcfa39 (patch) | |
| tree | c0040197acf7510b074af818ef8335b832e22e25 /chrome_frame | |
| parent | 1b4209f4c56fbdb6fe72aca508e8aa1c534964d4 (diff) | |
| download | chromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.zip chromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.tar.gz chromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.tar.bz2 | |
Revert r70628. It broke Linux valgrind bots. See for example
http://build.chromium.org/p/chromium.memory/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/963
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.
Originally applied: http://src.chromium.org/viewvc/chrome?view=rev&revision=70618
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=70619
Fixed and trying again...
Review URL: http://codereview.chromium.org/6125001
BUG=none
TEST=linux valgrind goes green.
Review URL: http://codereview.chromium.org/6142003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index e94b069..3311853 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -190,7 +190,6 @@ class ChromeFrameUploadRequestContext : public URLRequestContext { http_auth_handler_factory_, network_delegate_, NULL), - NULL /* net_log */, net::HttpCache::DefaultBackend::InMemory(0)); } 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); |