net/socket_stream/socket_stream_unittest.cc - Issue 848006: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket_stream/socket_stream_unittest.cc

Issue 848006: Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Split up RequestTracker into ConnectJobTracker+RequestTracker+RequestTrackerBase, address comments Created 10 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/socket_stream/socket_stream_unittest.cc

===================================================================

--- net/socket_stream/socket_stream_unittest.cc (revision 41560)

+++ net/socket_stream/socket_stream_unittest.cc (working copy)

@@ -6,9 +6,9 @@

#include <vector>

#include "base/callback.h"

-#include "net/base/load_log.h"

-#include "net/base/load_log_unittest.h"

#include "net/base/mock_host_resolver.h"

+#include "net/base/net_log.h"

+#include "net/base/net_log_unittest.h"

#include "net/base/test_completion_callback.h"

#include "net/socket/socket_test_util.h"

#include "net/socket_stream/socket_stream.h"

@@ -211,12 +211,7 @@

EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);

EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type);

- // The first and last entries of the LoadLog should be for

- // SOCKET_STREAM_CONNECT.

- EXPECT_TRUE(LogContainsBeginEvent(

- *socket_stream->load_log(), 0, LoadLog::TYPE_SOCKET_STREAM_CONNECT));

- EXPECT_TRUE(LogContainsEndEvent(

- *socket_stream->load_log(), -1, LoadLog::TYPE_SOCKET_STREAM_CONNECT));

+ // TODO(eroman): Add back NetLogTest here...

}

} // namespace net

« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_network_transaction.h » ('j') | no next file with comments »