| 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);
|
| };
|
|
|
|
|