diff options
author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:01:15 +0000 |
---|---|---|
committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:01:15 +0000 |
commit | 2bb044402ba016977b58014a22b0631ab7ed605d (patch) | |
tree | 6e85bb65048d4b262b6bb4e1d6d0e418957b857d /net/base/net_log_unittest.h | |
parent | 8748bdf9fe94b62e76e7adf7fac9af7dfd9c0ca3 (diff) | |
download | chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.zip chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.tar.gz chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.tar.bz2 |
Revert 56539 - Added HostResolveImpl Requests and Jobs to log.
ConnectJobs point to the requests, Requests point back to ConnectJobs and to the DNS lookup they were attached to, if any.
Also CONNECT_JOBs are now identified by their host/port on the Requests list.
BUG= 46844
TEST= Look at the net-internals screen.
Review URL: http://codereview.chromium.org/3080034
TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/3137022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_log_unittest.h')
-rw-r--r-- | net/base/net_log_unittest.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/net/base/net_log_unittest.h b/net/base/net_log_unittest.h index 9c7a42d..a013f23 100644 --- a/net/base/net_log_unittest.h +++ b/net/base/net_log_unittest.h @@ -106,7 +106,7 @@ inline ::testing::AssertionResult LogContainsEntryWithType( // Expect that the log contains an event, but don't care about where -// as long as the first index where it is found is at least |min_index|. +// as long as the index where it is found is greater than min_index. // Returns the position where the event was found. inline size_t ExpectLogContainsSomewhere( const CapturingNetLog::EntryList& entries, @@ -125,25 +125,6 @@ inline size_t ExpectLogContainsSomewhere( return i; } -// Expect that the log contains an event, but don't care about where -// as long as one index where it is found is at least |min_index|. -// Returns the first such position where the event was found. -inline size_t ExpectLogContainsSomewhereAfter( - const CapturingNetLog::EntryList& entries, - size_t min_index, - NetLog::EventType expected_event, - NetLog::EventPhase expected_phase) { - size_t i = min_index; - for (; i < entries.size(); ++i) { - const CapturingNetLog::Entry& entry = entries[i]; - if (entry.type == expected_event && - entry.phase == expected_phase) - break; - } - EXPECT_LT(i, entries.size()); - return i; -} - } // namespace net #endif // NET_BASE_NET_LOG_UNITTEST_H_ |