summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 18:19:36 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 18:19:36 +0000
commit635909faccd2bcabd0999e086a2d10c5b34d8062 (patch)
treebfd0c804d4e9df92bc4e2dbe30c95e2cd5908f57 /net/spdy/spdy_session.h
parentcefc3bf5b4cc3bd7db35d3e274173cf1563a9372 (diff)
downloadchromium_src-635909faccd2bcabd0999e086a2d10c5b34d8062.zip
chromium_src-635909faccd2bcabd0999e086a2d10c5b34d8062.tar.gz
chromium_src-635909faccd2bcabd0999e086a2d10c5b34d8062.tar.bz2
Plumb NetLog into SpdySession.
TODO(willchan): Start logging events for SpdySession. Review URL: http://codereview.chromium.org/2059004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
-rw-r--r--net/spdy/spdy_session.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index cff7b82..5382867 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -15,6 +15,7 @@
#include "net/base/io_buffer.h"
#include "net/base/load_states.h"
#include "net/base/net_errors.h"
+#include "net/base/net_log.h"
#include "net/base/request_priority.h"
#include "net/base/ssl_config_service.h"
#include "net/base/upload_data_stream.h"
@@ -41,8 +42,10 @@ class SpdySession : public base::RefCounted<SpdySession>,
public:
// Create a new SpdySession.
// |host_port_pair| is the host/port that this session connects to.
- // |session| is the HttpNetworkSession
- SpdySession(const HostPortPair& host_port_pair, HttpNetworkSession* session);
+ // |session| is the HttpNetworkSession. |net_log| is the NetLog that we log
+ // network events to.
+ SpdySession(const HostPortPair& host_port_pair, HttpNetworkSession* session,
+ const BoundNetLog& net_log);
const HostPortPair& host_port_pair() const { return host_port_pair_; }
@@ -52,8 +55,7 @@ class SpdySession : public base::RefCounted<SpdySession>,
// immediately start using the SpdySession while it connects.
net::Error Connect(const std::string& group_name,
const TCPSocketParams& destination,
- RequestPriority priority,
- const BoundNetLog& net_log);
+ RequestPriority priority);
// Get a stream for a given |request|. In the typical case, this will involve
// the creation of a new stream (and will send the SYN frame). If the server
@@ -62,7 +64,7 @@ class SpdySession : public base::RefCounted<SpdySession>,
// X-Associated-Content.
// Returns the new or existing stream. Never returns NULL.
scoped_refptr<SpdyStream> GetOrCreateStream(const HttpRequestInfo& request,
- const UploadDataStream* upload_data, const BoundNetLog& log);
+ const UploadDataStream* upload_data);
// Used by SpdySessionPool to initialize with a pre-existing SSL socket.
void InitializeWithSSLSocket(ClientSocketHandle* connection);
@@ -247,6 +249,8 @@ class SpdySession : public base::RefCounted<SpdySession>,
bool in_session_pool_; // True if the session is currently in the pool.
+ BoundNetLog net_log_;
+
static bool use_ssl_;
};