summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/simple_socket_stream_bridge.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 11:35:43 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 11:35:43 +0000
commit04be4b58872f706194c3a126aec973ec53897366 (patch)
tree6e9b2fa5f60413eaa514523089d7e46cc87c2b32 /webkit/tools/test_shell/simple_socket_stream_bridge.cc
parentf1869fdc0e8e49022ab4593eeba25fcb51f83ac1 (diff)
downloadchromium_src-04be4b58872f706194c3a126aec973ec53897366.zip
chromium_src-04be4b58872f706194c3a126aec973ec53897366.tar.gz
chromium_src-04be4b58872f706194c3a126aec973ec53897366.tar.bz2
Make WebSocketStreamHandleBridge RefCountedThreadSafe.
In layout_tests, test_shell crashed by /base/ref_counted.cc(60)] Check failed: in_dtor_. RefCountedThreadSafe object deleted without calling Release() in context of test_shell(webkit_glue::WebSocketStreamHandleImpl::Context::DidClose(WebKit::WebSocketStreamHandle*)+0x7d) [0x8f6b34b] Since bridge instance is ref counted object, we must not delete it. Make base class WebSocketStreamHandleBridge RefCountedThreadSafe, and manage it by scoped_refptr. BUG=25399 TEST=layout tests not crashed in XHR tests. Review URL: http://codereview.chromium.org/316008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/simple_socket_stream_bridge.cc')
-rw-r--r--webkit/tools/test_shell/simple_socket_stream_bridge.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index c8380cd..508b943 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -25,14 +25,12 @@ MessageLoop* g_io_thread;
scoped_refptr<URLRequestContext> g_request_context;
class WebSocketStreamHandleBridgeImpl
- : public base::RefCountedThreadSafe<WebSocketStreamHandleBridgeImpl>,
- public WebSocketStreamHandleBridge,
+ : public WebSocketStreamHandleBridge,
public net::SocketStream::Delegate {
public:
WebSocketStreamHandleBridgeImpl(
WebKit::WebSocketStreamHandle* handle,
webkit_glue::WebSocketStreamHandleDelegate* delegate);
- virtual ~WebSocketStreamHandleBridgeImpl();
// WebSocketStreamHandleBridge methods.
virtual void Connect(const GURL& url);
@@ -48,8 +46,9 @@ class WebSocketStreamHandleBridgeImpl
const char* data, int len);
virtual void OnClose(net::SocketStream* req);
-
private:
+ virtual ~WebSocketStreamHandleBridgeImpl();
+
// Runs on |g_io_thread|;
void DoConnect(const GURL& url);
void DoSend(std::vector<char>* data);