Fixed UDP unittests for MacOS X 10.7

Fixed Connect and VerifyConnectBindsAddr unittests.
As broadcast option is blocked for regular users on OSX, added check for UID to Broadcast unittest.

Also, disabled browser_test:UDPSocketPrivate_Broadcast as it's compiled via NaCl toolchain, so we can't recognize current OS being inside that test. 

BUG=145487
TEST=net_unittests:UDPSocketTest.*

Review URL: https://chromiumcodereview.appspot.com/10916052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157399 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 6 deletions

diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index 6736d88..d3b728b 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -287,9 +287,27 @@ TEST_PPAPI_NACL_WITH_SSL_SERVER(MAYBE_TCPSocketPrivate)
 TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
 TEST_PPAPI_IN_PROCESS_WITH_SSL_SERVER(TCPSocketPrivateTrusted)
 
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate)
-TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate)
+// UDPSocketPrivate tests.
+// UDPSocketPrivate_Broadcast is disabled for OSX because it requires
+// root permissions on OSX 10.7+.
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
+#if !defined(OS_MACOSX)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
+#endif  // !defined(OS_MACOSX)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Connect)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
+#if !defined(OS_MACOSX)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_Broadcast)
+#endif  // !defined(OS_MACOSX)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
+TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Connect)
+TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_ConnectFailure)
+#if !defined(OS_MACOSX)
+TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_Broadcast)
+#endif  // !defined(OS_MACOSX)
+TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivate_SetSocketFeatureErrors)
 
 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPServerSocketPrivateDisallowed)
 TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(TCPSocketPrivateDisallowed)
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index 3bfee4c..1be416a 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -131,10 +131,11 @@ TEST_F(UDPSocketTest, Connect) {
 
   // Setup the server to listen.
   IPEndPoint bind_address;
-  CreateUDPAddress("0.0.0.0", kPort, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort, &bind_address);
   CapturingNetLog server_log;
   scoped_ptr<UDPServerSocket> server(
       new UDPServerSocket(&server_log, NetLog::Source()));
+  server->AllowAddressReuse();
   int rv = server->Listen(bind_address);
   ASSERT_EQ(OK, rv);
 
@@ -201,7 +202,13 @@ TEST_F(UDPSocketTest, Connect) {
       client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
 }
 
+// UDPSocketPrivate_Broadcast is disabled for OSX because it requires
+// root permissions on OSX 10.7+.
+#if defined(OS_MACOSX)
+TEST_F(UDPSocketTest, DISABLED_Broadcast) {
+#else
 TEST_F(UDPSocketTest, Broadcast) {
+#endif
   const int kPort = 9999;
   std::string first_message("first message"), second_message("second message");
 
@@ -335,14 +342,16 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
 
   // Setup the first server to listen.
   IPEndPoint bind_address;
-  CreateUDPAddress("0.0.0.0", kPort1, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort1, &bind_address);
   UDPServerSocket server1(NULL, NetLog::Source());
+  server1.AllowAddressReuse();
   int rv = server1.Listen(bind_address);
   ASSERT_EQ(OK, rv);
 
   // Setup the second server to listen.
-  CreateUDPAddress("0.0.0.0", kPort2, &bind_address);
+  CreateUDPAddress("127.0.0.1", kPort2, &bind_address);
   UDPServerSocket server2(NULL, NetLog::Source());
+  server2.AllowAddressReuse();
   rv = server2.Listen(bind_address);
   ASSERT_EQ(OK, rv);