Return errors from the Mojo network service using an enum.

mojo/services/network/udp_socket_apptest.cc

Index: mojo/services/network/udp_socket_apptest.cc
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index 9c783f604910e7186c9a84d89595c840152bf1aa..e7d3f3fefbccc62d2cfa8147567a562dc19121b8 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -344,41 +344,41 @@ TEST_F(UDPSocketAppTest, Settings) {
   TestCallback callback1;
   socket_->AllowAddressReuse(callback1.callback());
   callback1.WaitForResult();
-  EXPECT_EQ(net::OK, callback1.result()->code);
+  EXPECT_EQ(mojo::NETWORK_CODE_OK, callback1.result()->code);

[jamesr, 2015/02/18 18:43:06]

this code is in namespace mojo - just saying EXPECT_EQ(NETWORK_CODE_OK...)
should work

[ppi, 2015/02/19 14:22:18]

Done.

 
   // Should fail because the socket hasn't been bound.
   TestCallback callback2;
   socket_->SetSendBufferSize(1024, callback2.callback());
   callback2.WaitForResult();
-  EXPECT_NE(net::OK, callback2.result()->code);
+  EXPECT_NE(mojo::NETWORK_CODE_OK, callback2.result()->code);
 
   // Should fail because the socket hasn't been bound.
   TestCallback callback3;
   socket_->SetReceiveBufferSize(2048, callback3.callback());
   callback3.WaitForResult();
-  EXPECT_NE(net::OK, callback3.result()->code);
+  EXPECT_NE(mojo::NETWORK_CODE_OK, callback3.result()->code);
 
   TestCallbackWithAddressAndReceiver callback4;
   socket_->Bind(GetLocalHostWithAnyPort(), callback4.callback());
   callback4.WaitForResult();
-  EXPECT_EQ(net::OK, callback4.result()->code);
+  EXPECT_EQ(mojo::NETWORK_CODE_OK, callback4.result()->code);
   EXPECT_NE(0u, callback4.net_address()->ipv4->port);
 
   // Should fail because the socket has been bound.
   TestCallback callback5;
   socket_->AllowAddressReuse(callback5.callback());
   callback5.WaitForResult();
-  EXPECT_NE(net::OK, callback5.result()->code);
+  EXPECT_NE(mojo::NETWORK_CODE_OK, callback5.result()->code);
 
   TestCallback callback6;
   socket_->SetSendBufferSize(1024, callback6.callback());
   callback6.WaitForResult();
-  EXPECT_EQ(net::OK, callback6.result()->code);
+  EXPECT_EQ(mojo::NETWORK_CODE_OK, callback6.result()->code);
 
   TestCallback callback7;
   socket_->SetReceiveBufferSize(2048, callback7.callback());
   callback7.WaitForResult();
-  EXPECT_EQ(net::OK, callback7.result()->code);
+  EXPECT_EQ(mojo::NETWORK_CODE_OK, callback7.result()->code);
 
   TestCallbackWithUint32 callback8;
   socket_->NegotiateMaxPendingSendRequests(0, callback8.callback());
@@ -395,7 +395,7 @@ TEST_F(UDPSocketAppTest, TestReadWrite) {
   TestCallbackWithAddressAndReceiver callback1;
   socket_->Bind(GetLocalHostWithAnyPort(), callback1.callback());
   callback1.WaitForResult();
-  ASSERT_EQ(net::OK, callback1.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback1.result()->code);
   ASSERT_NE(0u, callback1.net_address()->ipv4->port);
 
   receiver_binding_.Bind(callback1.receiver().Pass());
@@ -408,7 +408,7 @@ TEST_F(UDPSocketAppTest, TestReadWrite) {
   TestCallbackWithAddressAndReceiver callback2;
   client_socket->Bind(GetLocalHostWithAnyPort(), callback2.callback());
   callback2.WaitForResult();
-  ASSERT_EQ(net::OK, callback2.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback2.result()->code);
   ASSERT_NE(0u, callback2.net_address()->ipv4->port);
 
   NetAddressPtr client_addr = callback2.net_address().Clone();
@@ -443,7 +443,7 @@ TEST_F(UDPSocketAppTest, TestConnectedReadWrite) {
   TestCallbackWithAddressAndReceiver callback1;
   socket_->Bind(GetLocalHostWithAnyPort(), callback1.callback());
   callback1.WaitForResult();
-  ASSERT_EQ(net::OK, callback1.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback1.result()->code);
   ASSERT_NE(0u, callback1.net_address()->ipv4->port);
 
   receiver_binding_.Bind(callback1.receiver().Pass());
@@ -456,7 +456,7 @@ TEST_F(UDPSocketAppTest, TestConnectedReadWrite) {
   TestCallbackWithAddressAndReceiver callback2;
   client_socket->Connect(server_addr.Clone(), callback2.callback());
   callback2.WaitForResult();
-  ASSERT_EQ(net::OK, callback2.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback2.result()->code);
   ASSERT_NE(0u, callback2.net_address()->ipv4->port);
 
   UDPSocketReceiverImpl client_socket_receiver;
@@ -523,7 +523,7 @@ TEST_F(UDPSocketAppTest, TestWrapperReadWrite) {
   TestCallbackWithAddress callback1;
   socket.Bind(GetLocalHostWithAnyPort(), callback1.callback());
   callback1.WaitForResult();
-  ASSERT_EQ(net::OK, callback1.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback1.result()->code);
   ASSERT_NE(0u, callback1.net_address()->ipv4->port);
 
   NetAddressPtr server_addr = callback1.net_address().Clone();
@@ -535,7 +535,7 @@ TEST_F(UDPSocketAppTest, TestWrapperReadWrite) {
   TestCallbackWithAddress callback2;
   client_socket.Bind(GetLocalHostWithAnyPort(), callback2.callback());
   callback2.WaitForResult();
-  ASSERT_EQ(net::OK, callback2.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback2.result()->code);
   ASSERT_NE(0u, callback2.net_address()->ipv4->port);
 
   NetAddressPtr client_addr = callback2.net_address().Clone();
@@ -575,7 +575,7 @@ TEST_F(UDPSocketAppTest, TestWrapperConnectedReadWrite) {
   TestCallbackWithAddress callback1;
   socket.Bind(GetLocalHostWithAnyPort(), callback1.callback());
   callback1.WaitForResult();
-  ASSERT_EQ(net::OK, callback1.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback1.result()->code);
   ASSERT_NE(0u, callback1.net_address()->ipv4->port);
 
   NetAddressPtr server_addr = callback1.net_address().Clone();
@@ -587,7 +587,7 @@ TEST_F(UDPSocketAppTest, TestWrapperConnectedReadWrite) {
   TestCallbackWithAddress callback2;
   client_socket.Connect(server_addr.Pass(), callback2.callback());
   callback2.WaitForResult();
-  ASSERT_EQ(net::OK, callback2.result()->code);
+  ASSERT_EQ(mojo::NETWORK_CODE_OK, callback2.result()->code);
   ASSERT_NE(0u, callback2.net_address()->ipv4->port);
 
   NetAddressPtr client_addr = callback2.net_address().Clone();