Create a path to deliver SocketStream errors to the renderer.

net/socket_stream/socket_stream_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/auth.h"
 #include "net/base/mock_host_resolver.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 struct SocketStreamEvent {
   enum EventType {
     EVENT_CONNECTED, EVENT_SENT_DATA, EVENT_RECEIVED_DATA, EVENT_CLOSE,
-    EVENT_AUTH_REQUIRED,
+    EVENT_AUTH_REQUIRED, EVENT_ERROR,
   };
 
   SocketStreamEvent(EventType type, net::SocketStream* socket_stream,
                     int num, const std::string& str,
                     net::AuthChallengeInfo* auth_challenge_info)
       : event_type(type), socket(socket_stream), number(num), data(str),
         auth_info(auth_challenge_info) {}
 
   EventType event_type;
   net::SocketStream* socket;
   int number;
   std::string data;
   scoped_refptr<net::AuthChallengeInfo> auth_info;
 };
 
 class SocketStreamEventRecorder : public net::SocketStream::Delegate {
  public:
   explicit SocketStreamEventRecorder(net::CompletionCallback* callback)
       : on_connected_(NULL),
         on_sent_data_(NULL),
         on_received_data_(NULL),
         on_close_(NULL),
         on_auth_required_(NULL),
+        on_error_(NULL),
         callback_(callback) {}
   virtual ~SocketStreamEventRecorder() {
     delete on_connected_;
     delete on_sent_data_;
     delete on_received_data_;
     delete on_close_;
     delete on_auth_required_;
+    delete on_error_;
   }
 
   void SetOnConnected(Callback1<SocketStreamEvent*>::Type* callback) {
     on_connected_ = callback;
   }
   void SetOnSentData(Callback1<SocketStreamEvent*>::Type* callback) {
     on_sent_data_ = callback;
   }
   void SetOnReceivedData(Callback1<SocketStreamEvent*>::Type* callback) {
     on_received_data_ = callback;
   }
   void SetOnClose(Callback1<SocketStreamEvent*>::Type* callback) {
     on_close_ = callback;
   }
   void SetOnAuthRequired(Callback1<SocketStreamEvent*>::Type* callback) {
     on_auth_required_ = callback;
   }
+  void SetOnError(Callback1<SocketStreamEvent*>::Type* callback) {
+    on_error_ = callback;
+  }
 
   virtual void OnConnected(net::SocketStream* socket,
                            int num_pending_send_allowed) {
     events_.push_back(
         SocketStreamEvent(SocketStreamEvent::EVENT_CONNECTED,
                           socket, num_pending_send_allowed, std::string(),
                           NULL));
     if (on_connected_)
       on_connected_->Run(&events_.back());
   }
@@ skipping 23 matching lines @@
       callback_->Run(net::OK);
   }
   virtual void OnAuthRequired(net::SocketStream* socket,
                               net::AuthChallengeInfo* auth_info) {
     events_.push_back(
         SocketStreamEvent(SocketStreamEvent::EVENT_AUTH_REQUIRED,
                           socket, 0, std::string(), auth_info));
     if (on_auth_required_)
       on_auth_required_->Run(&events_.back());
   }
+  virtual void OnError(const net::SocketStream* const_socket, int error) {
+    // TODO(yutak): Need to figure out a way to create SocketStreamEvent

[ukai, 2011/05/10 08:10:39]

can't we const net::SocketStream* socket in SocketStreamEvent?

[Yuta Kitamura, 2011/05/10 09:01:22]

No, because there are several uses of non-const member functions such as
|event->socket->SendData()| or |event->socket->Close()|.

[ukai, 2011/05/10 10:00:29]

Hmm. then I think SocketStreamEvent should have net::SocketStream* and const
net::SocketStream*.

or it might be ok to change OnError passes non-const net::SocketStream*.

+    // with |const net::SocketStream*|.
+    net::SocketStream* socket = const_cast<net::SocketStream*>(const_socket);
+    events_.push_back(
+        SocketStreamEvent(SocketStreamEvent::EVENT_ERROR,
+                          socket, error, std::string(), NULL));
+    if (on_error_)
+      on_error_->Run(&events_.back());
+  }
 
   void DoClose(SocketStreamEvent* event) {
     event->socket->Close();
   }
   void DoRestartWithAuth(SocketStreamEvent* event) {
     VLOG(1) << "RestartWithAuth username=" << username_
             << " password=" << password_;
     event->socket->RestartWithAuth(username_, password_);
   }
   void SetAuthInfo(const string16& username,
                    const string16& password) {
     username_ = username;
     password_ = password;
   }
 
   const std::vector<SocketStreamEvent>& GetSeenEvents() const {
     return events_;
   }
 
  private:
   std::vector<SocketStreamEvent> events_;
   Callback1<SocketStreamEvent*>::Type* on_connected_;
   Callback1<SocketStreamEvent*>::Type* on_sent_data_;
   Callback1<SocketStreamEvent*>::Type* on_received_data_;
   Callback1<SocketStreamEvent*>::Type* on_close_;
   Callback1<SocketStreamEvent*>::Type* on_auth_required_;
+  Callback1<SocketStreamEvent*>::Type* on_error_;
   net::CompletionCallback* callback_;
 
   string16 username_;
   string16 password_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStreamEventRecorder);
 };
 
 namespace net {
 
@@ skipping 117 matching lines @@
       GetMockClientSocketFactory();
   mock_socket_factory->AddSocketDataProvider(data_provider.get());
 
   socket_stream->SetClientSocketFactory(mock_socket_factory);
 
   socket_stream->Connect();
 
   callback.WaitForResult();
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
-  EXPECT_EQ(6U, events.size());
+  EXPECT_EQ(7U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[1].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[2].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[3].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[4].event_type);
-  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[5].event_type);
+  EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[5].event_type);
+  EXPECT_EQ(ERR_CONNECTION_CLOSED, events[5].number);
+  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[6].event_type);
 }
 
 TEST_F(SocketStreamTest, BasicAuthProxy) {
   MockClientSocketFactory mock_socket_factory;
   MockWrite data_writes1[] = {
     MockWrite("CONNECT example.com:80 HTTP/1.1\r\n"
               "Host: example.com\r\n"
               "Proxy-Connection: keep-alive\r\n\r\n"),
   };
   MockRead data_reads1[] = {
@@ skipping 41 matching lines @@
   socket_stream->set_context(new TestURLRequestContext("myproxy:70"));
   MockHostResolver host_resolver;
   socket_stream->SetHostResolver(&host_resolver);
   socket_stream->SetClientSocketFactory(&mock_socket_factory);
 
   socket_stream->Connect();
 
   callback.WaitForResult();
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
-  EXPECT_EQ(3U, events.size());
+  EXPECT_EQ(4U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_AUTH_REQUIRED, events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
-  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type);
+  EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[2].event_type);
+  EXPECT_EQ(ERR_ABORTED, events[2].number);
+  EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type);
 
   // TODO(eroman): Add back NetLogTest here...
 }
 
 }  // namespace net