Change condition to EXPECT in UDPSocketTest.TestBindToNetwork
NetworkHandles should be supported in Lollipop and newer releases.
Change-Id: Ia19095b883926daf97456d81201a3e8d93859467
Reviewed-on: https://chromium-review.googlesource.com/809224
Commit-Queue: Paul Jensen <[email protected]>
Reviewed-by: Helen Li <[email protected]>
Cr-Commit-Position: refs/heads/master@{#521814}diff --git a/net/socket/udp_socket_unittest.cc b/net/socket/udp_socket_unittest.cc
index 100d94b0..364ace4 100644
--- a/net/socket/udp_socket_unittest.cc
+++ b/net/socket/udp_socket_unittest.cc
@@ -34,6 +34,8 @@
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
+#include "net/android/network_change_notifier_factory_android.h"
+#include "net/base/network_change_notifier.h"
#endif
#if defined(OS_IOS)
@@ -734,6 +736,11 @@
TEST_F(UDPSocketTest, TestBindToNetwork) {
UDPSocket socket(DatagramSocket::RANDOM_BIND, base::Bind(&PrivilegedRand),
NULL, NetLogSource());
+#if defined(OS_ANDROID)
+ NetworkChangeNotifierFactoryAndroid ncn_factory;
+ NetworkChangeNotifier::DisableForTest ncn_disable_for_test;
+ std::unique_ptr<NetworkChangeNotifier> ncn(ncn_factory.CreateInstance());
+#endif
ASSERT_EQ(OK, socket.Open(ADDRESS_FAMILY_IPV4));
// Test unsuccessful binding, by attempting to bind to a bogus NetworkHandle.
int rv = socket.BindToNetwork(65536);
@@ -767,12 +774,11 @@
socket.BindToNetwork(NetworkChangeNotifier::kInvalidNetworkHandle));
// Test successful binding, if possible.
- if (NetworkChangeNotifier::AreNetworkHandlesSupported()) {
- NetworkChangeNotifier::NetworkHandle network_handle =
- NetworkChangeNotifier::GetDefaultNetwork();
- if (network_handle != NetworkChangeNotifier::kInvalidNetworkHandle) {
- EXPECT_EQ(OK, socket.BindToNetwork(network_handle));
- }
+ EXPECT_TRUE(NetworkChangeNotifier::AreNetworkHandlesSupported());
+ NetworkChangeNotifier::NetworkHandle network_handle =
+ NetworkChangeNotifier::GetDefaultNetwork();
+ if (network_handle != NetworkChangeNotifier::kInvalidNetworkHandle) {
+ EXPECT_EQ(OK, socket.BindToNetwork(network_handle));
}
}
#endif
