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

1 files changed, 8 insertions, 4 deletions

diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index b0734fc..e98e0df 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -356,7 +356,7 @@ TEST_F(SocketStreamTest, CloseFlushPendingWrite) {
   test_callback.WaitForResult();
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
-  ASSERT_EQ(7U, events.size());
+  ASSERT_EQ(8U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
             events[0].event_type);
@@ -365,7 +365,9 @@ TEST_F(SocketStreamTest, CloseFlushPendingWrite) {
   EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[3].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[5].event_type);
-  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[6].event_type);
+  EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[6].event_type);
+  EXPECT_EQ(ERR_CONNECTION_CLOSED, events[6].error_code);
+  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[7].event_type);
 }
 
 TEST_F(SocketStreamTest, ExceedMaxPendingSendAllowed) {
@@ -643,7 +645,7 @@ TEST_F(SocketStreamTest, IOPending) {
   EXPECT_EQ(OK, test_callback.WaitForResult());
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
-  ASSERT_EQ(7U, events.size());
+  ASSERT_EQ(8U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
             events[0].event_type);
@@ -652,7 +654,9 @@ TEST_F(SocketStreamTest, IOPending) {
   EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[3].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[5].event_type);
-  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[6].event_type);
+  EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[6].event_type);
+  EXPECT_EQ(ERR_CONNECTION_CLOSED, events[6].error_code);
+  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[7].event_type);
 }
 
 TEST_F(SocketStreamTest, SwitchToSpdy) {