diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 23:57:54 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 23:57:54 +0000 |
| commit | 73c4532bd7f5b84bc822a4acca5c5b8affef4129 (patch) | |
| tree | dc2a525aab1bda568b52ea78e72c8be79b9165dc /net/websockets | |
| parent | 3209e71131849f3e0d513cd3fd8dca881f05d531 (diff) | |
| download | chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.zip chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.tar.gz chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.tar.bz2 | |
Stop refcounting HostResolver.
BUG=46049
TEST=none
Review URL: http://codereview.chromium.org/3601002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket.h | 2 | ||||
| -rw-r--r-- | net/websockets/websocket_unittest.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/websockets/websocket.h b/net/websockets/websocket.h index 19720ae..c729afc 100644 --- a/net/websockets/websocket.h +++ b/net/websockets/websocket.h @@ -115,7 +115,7 @@ class WebSocket : public base::RefCountedThreadSafe<WebSocket>, ProtocolVersion version_; scoped_refptr<URLRequestContext> context_; - scoped_refptr<HostResolver> host_resolver_; + HostResolver* host_resolver_; ClientSocketFactory* client_socket_factory_; DISALLOW_COPY_AND_ASSIGN(Request); diff --git a/net/websockets/websocket_unittest.cc b/net/websockets/websocket_unittest.cc index 4b65ae9..e711266 100644 --- a/net/websockets/websocket_unittest.cc +++ b/net/websockets/websocket_unittest.cc @@ -165,6 +165,7 @@ TEST_F(WebSocketTest, Connect) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes)); mock_socket_factory.AddSocketDataProvider(&data); + MockHostResolver host_resolver; WebSocket::Request* request( new WebSocket::Request(GURL("ws://example.com/demo"), @@ -173,7 +174,7 @@ TEST_F(WebSocketTest, Connect) { "ws://example.com/demo", WebSocket::DRAFT75, new TestURLRequestContext())); - request->SetHostResolver(new MockHostResolver()); + request->SetHostResolver(&host_resolver); request->SetClientSocketFactory(&mock_socket_factory); TestCompletionCallback callback; @@ -227,6 +228,7 @@ TEST_F(WebSocketTest, ServerSentData) { StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes)); mock_socket_factory.AddSocketDataProvider(&data); + MockHostResolver host_resolver; WebSocket::Request* request( new WebSocket::Request(GURL("ws://example.com/demo"), @@ -235,7 +237,7 @@ TEST_F(WebSocketTest, ServerSentData) { "ws://example.com/demo", WebSocket::DRAFT75, new TestURLRequestContext())); - request->SetHostResolver(new MockHostResolver()); + request->SetHostResolver(&host_resolver); request->SetClientSocketFactory(&mock_socket_factory); TestCompletionCallback callback; |