Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: net/socket_stream/socket_stream.h

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
« no previous file with comments | « net/socket/tcp_client_socket_win.cc ('k') | net/socket_stream/socket_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream.h
===================================================================
--- net/socket_stream/socket_stream.h (revision 41560)
+++ net/socket_stream/socket_stream.h (working copy)
@@ -17,12 +17,12 @@
#include "net/base/address_list.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
+#include "net/base/net_log.h"
#include "net/http/http_auth.h"
#include "net/http/http_auth_cache.h"
#include "net/http/http_auth_handler.h"
#include "net/proxy/proxy_service.h"
#include "net/socket/tcp_client_socket.h"
-#include "net/url_request/request_tracker.h"
#include "net/url_request/url_request_context.h"
namespace net {
@@ -31,7 +31,6 @@
class ClientSocketFactory;
class HostResolver;
class HttpAuthHandlerFactory;
-class LoadLog;
class SSLConfigService;
class SingleRequestHostResolver;
class SocketStreamMetrics;
@@ -109,7 +108,7 @@
URLRequestContext* context() const { return context_.get(); }
void set_context(URLRequestContext* context);
- LoadLog* load_log() const { return load_log_; }
+ BoundNetLog* net_log() { return &net_log_; }
// Opens the connection on the IO thread.
// Once the connection is established, calls delegate's OnConnected.
@@ -207,7 +206,6 @@
};
typedef std::deque< scoped_refptr<IOBufferWithSize> > PendingDataQueue;
- friend class RequestTracker<SocketStream>;
friend class WebSocketThrottleTest;
@@ -256,11 +254,8 @@
SSLConfigService* ssl_config_service() const;
ProxyService* proxy_service() const;
- void GetInfoForTracker(
- RequestTracker<SocketStream>::RecentRequestInfo* info) const;
+ BoundNetLog net_log_;
- scoped_refptr<LoadLog> load_log_;
-
GURL url_;
int max_pending_send_allowed_;
scoped_refptr<URLRequestContext> context_;
@@ -322,8 +317,6 @@
scoped_ptr<SocketStreamMetrics> metrics_;
- RequestTracker<SocketStream>::Node request_tracker_node_;
-
DISALLOW_COPY_AND_ASSIGN(SocketStream);
};
« no previous file with comments | « net/socket/tcp_client_socket_win.cc ('k') | net/socket_stream/socket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698