Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: net/base/address_tracker_linux_unittest.cc

Issue 739983005: Determine connection type in NetworkChangeNotifierLinux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/address_tracker_linux_unittest.cc
diff --git a/net/base/address_tracker_linux_unittest.cc b/net/base/address_tracker_linux_unittest.cc
index 641220731b71bbbe43b54f4e8b564921494f5b64..1150ccb9a71107bda0859139f42eeed687c82d77 100644
--- a/net/base/address_tracker_linux_unittest.cc
+++ b/net/base/address_tracker_linux_unittest.cc
@@ -22,10 +22,12 @@ namespace {
const int kTestInterfaceTun = 123;
-const char* TestGetInterfaceName(int interface_index) {
+char* TestGetInterfaceName(unsigned int interface_index, char* buf) {
if (interface_index == kTestInterfaceTun)
- return "tun0";
- return "eth0";
+ strncpy(buf, "tun0", IFNAMSIZ);
+ else
+ strncpy(buf, "eth0", IFNAMSIZ);
+ return buf;
}
} // namespace
@@ -520,8 +522,10 @@ TEST_F(AddressTrackerLinuxTest, TunnelInterface) {
TEST_F(AddressTrackerLinuxTest, GetInterfaceName) {
InitializeAddressTracker(true);
- for (int i = 0; i < 10; i++)
- EXPECT_NE((const char*)NULL, original_get_interface_name_(i));
+ for (int i = 0; i < 10; i++) {
+ char buf[IFNAMSIZ] = {0};
+ EXPECT_NE((const char*)NULL, original_get_interface_name_(i, buf));
+ }
}
TEST_F(AddressTrackerLinuxTest, NonTrackingMode) {

Powered by Google App Engine
This is Rietveld 408576698