diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:24:00 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:24:00 +0000 |
| commit | fb9c064d4155b4eed02d4ce1a858ae272eedfacd (patch) | |
| tree | 0fe0d1504b2a0164717a73d1bb4fb3fd771a4992 /content/browser/renderer_host/socket_stream_host.cc | |
| parent | 9ac8d08cfd2244f31b386111b2fc1c6a2fd7f438 (diff) | |
| download | chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.zip chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.tar.gz chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.tar.bz2 | |
Revert 196728 "Websocket should fire 'error' event if no server ..."
Looks like it made a layout test flaky.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showLargeExpectations=true&showExpectations=true&tests=http%252Ftests%252Fwebsocket%252Ftests%252Fhybi%252Fclose.html
> Websocket should fire 'error' event if no server available
> Implement OnError virtual function, when network is down, OnError can be invoked.
> Send error code to render process from browser process through IPC.
>
> This patch depends on Blink side patch which can be found from https://codereview.chromium.org/14071008/
>
>
> BUG=128057
> TEST=
>
> Review URL: https://chromiumcodereview.appspot.com/10668018
TBR=li.yin@intel.com
Review URL: https://codereview.chromium.org/14335011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/socket_stream_host.cc')
| -rw-r--r-- | content/browser/renderer_host/socket_stream_host.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/renderer_host/socket_stream_host.cc b/content/browser/renderer_host/socket_stream_host.cc index 405a2b7..b3c9d4c 100644 --- a/content/browser/renderer_host/socket_stream_host.cc +++ b/content/browser/renderer_host/socket_stream_host.cc @@ -39,8 +39,7 @@ SocketStreamHost::SocketStreamHost( } /* static */ -int SocketStreamHost::SocketIdFromSocketStream( - const net::SocketStream* socket) { +int SocketStreamHost::SocketIdFromSocketStream(net::SocketStream* socket) { net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey); if (d) { SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d); |