Regression test for lack of errors on requests with invalid ports

net/url_request/url_request_unittest.cc

Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 1fdfc1dcf0ef74e53a2b67f64af66873e242e818..68503eb17a6ffa9b66e117df60055b568c476455 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -52,6 +52,7 @@
 #include "net/proxy/proxy_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/test/test_server.h"
+#include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_dir_job.h"
 #include "net/url_request/url_request_http_job.h"
@@ -4112,6 +4113,37 @@ class URLRequestTestFTP : public URLRequestTest {
   TestServer test_server_;
 };
 
+TEST_F(URLRequestTestFTP, Errors) {

[mmenke, 2012/08/03 15:40:54]

Think it's best to document even fairly straightforward tests.  Maybe just
something along the liens of "Make sure an FTP request using an unsafe ports
fails."

[mmenke, 2012/08/03 15:40:54]

Think "UnsafePort" would be a clearer name.

[shalev, 2012/08/05 07:12:55]

Done.

[shalev, 2012/08/05 07:12:55]

Done.

+  ASSERT_TRUE(test_server_.Start());
+
+  URLRequestJobFactory job_factory;
+
+  GURL url("ftp://127.0.0.1:7");
+  FtpProtocolHandler ftp_protocol_handler(
+      default_context_.network_delegate(),
+      default_context_.ftp_transaction_factory(),
+      default_context_.ftp_auth_cache());
+  job_factory.SetProtocolHandler(
+      "ftp",
+      new FtpProtocolHandler(default_context_.network_delegate(),
+                             default_context_.ftp_transaction_factory(),
+                             default_context_.ftp_auth_cache()));
+  default_context_.set_job_factory(&job_factory);
+
+  TestDelegate d;
+  {
+    URLRequest r(url, &d, &default_context_);
+    r.Start();
+    EXPECT_TRUE(r.is_pending());
+
+    MessageLoop::current()->Run();
+
+    EXPECT_FALSE(r.is_pending());
+    EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+    EXPECT_EQ(ERR_UNSAFE_PORT, r.status().error());
+  }
+}
+
 // Flaky, see http://crbug.com/25045.
 TEST_F(URLRequestTestFTP, DISABLED_FTPDirectoryListing) {
   ASSERT_TRUE(test_server_.Start());