diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:03:53 +0000 |
| commit | 9e743cddfd631038fe6f1cdde050e18d61319ec6 (patch) | |
| tree | 7ef974e43b23f570433fe819bcd07966165c517f /net/socket/client_socket_handle.h | |
| parent | 2e7aff66fe443c29b2fc14a776dca5512b0b4729 (diff) | |
| download | chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.zip chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.gz chromium_src-9e743cddfd631038fe6f1cdde050e18d61319ec6.tar.bz2 | |
Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).
This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events.
This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up.
The user-visible behavior should remain unchanged.
BUG=37421
Review URL: http://codereview.chromium.org/848006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_handle.h')
| -rw-r--r-- | net/socket/client_socket_handle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h index bf7bf8a..782ad48 100644 --- a/net/socket/client_socket_handle.h +++ b/net/socket/client_socket_handle.h @@ -55,7 +55,7 @@ class ClientSocketHandle { // // Init may be called multiple times. // - // Profiling information for the request is saved to |load_log| if non-NULL. + // Profiling information for the request is saved to |net_log| if non-NULL. // template <typename SocketParams, typename PoolType> int Init(const std::string& group_name, @@ -63,7 +63,7 @@ class ClientSocketHandle { RequestPriority priority, CompletionCallback* callback, PoolType* pool, - LoadLog* load_log); + const BoundNetLog& net_log); // An initialized handle can be reset, which causes it to return to the // un-initialized state. This releases the underlying socket, which in the @@ -150,7 +150,7 @@ int ClientSocketHandle::Init(const std::string& group_name, RequestPriority priority, CompletionCallback* callback, PoolType* pool, - LoadLog* load_log) { + const BoundNetLog& net_log) { CHECK(!group_name.empty()); // Note that this will result in a link error if the SocketParams has not been // registered for the PoolType via REGISTER_SOCKET_PARAMS_FOR_POOL (defined in @@ -161,7 +161,7 @@ int ClientSocketHandle::Init(const std::string& group_name, group_name_ = group_name; init_time_ = base::TimeTicks::Now(); int rv = pool_->RequestSocket( - group_name, &socket_params, priority, this, &callback_, load_log); + group_name, &socket_params, priority, this, &callback_, net_log); if (rv == ERR_IO_PENDING) { user_callback_ = callback; } else { |