Index: net/websockets/websocket_test_util.h |
diff --git a/net/websockets/websocket_test_util.h b/net/websockets/websocket_test_util.h |
index 5c7db80eac748fe676394e5b221cf39866bc38ff..f9bf96107ded5c8ed3d06681c1d28adfc461ea12 100644 |
--- a/net/websockets/websocket_test_util.h |
+++ b/net/websockets/websocket_test_util.h |
@@ -27,6 +27,7 @@ namespace net { |
class BoundNetLog; |
class DeterministicMockClientSocketFactory; |
class DeterministicSocketData; |
+class ProxyService; |
class URLRequestContext; |
class WebSocketHandshakeStreamCreateHelper; |
struct SSLSocketDataProvider; |
@@ -123,6 +124,12 @@ struct WebSocketTestURLRequestContextHost { |
void AddSSLSocketDataProvider( |
scoped_ptr<SSLSocketDataProvider> ssl_socket_data); |
+ // Allow a proxy to be set. Usage: |
+ // SetProxyConfig("proxy1:8000"); |
+ // Any syntax accepted by net::ProxyConfig::ParseFromString() will work. |
+ // Do not call after GetURLRequestContext() has been called. |
+ void SetProxyConfig(const std::string& proxy_rules); |
+ |
// Call after calling one of SetExpections() or AddRawExpectations(). The |
// returned pointer remains owned by this object. |
TestURLRequestContext* GetURLRequestContext(); |
@@ -131,6 +138,7 @@ struct WebSocketTestURLRequestContextHost { |
WebSocketDeterministicMockClientSocketFactoryMaker maker_; |
TestURLRequestContext url_request_context_; |
TestNetworkDelegate network_delegate_; |
+ scoped_ptr<ProxyService> proxy_service_; |
bool url_request_context_initialized_; |
DISALLOW_COPY_AND_ASSIGN(WebSocketTestURLRequestContextHost); |