Update from https://crrev.com/314320

net/base/address_tracker_linux_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/address_tracker_linux.h"
 
 #include <linux/if.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #ifndef IFA_F_HOMEADDRESS
 #define IFA_F_HOMEADDRESS 0x10
 #endif
 
 namespace net {
 namespace internal {
 namespace {
 
 const int kTestInterfaceTun = 123;
 
-const char* TestGetInterfaceName(int interface_index) {
+char* TestGetInterfaceName(int interface_index, char* buf) {
   if (interface_index == kTestInterfaceTun)
-    return "tun0";
-  return "eth0";
+    return strncpy(buf, "tun0", IFNAMSIZ);
+  return strncpy(buf, "eth0", IFNAMSIZ);
 }
 
 }  // namespace
 
 typedef std::vector<char> Buffer;
 
 class AddressTrackerLinuxTest : public testing::Test {
  protected:
   AddressTrackerLinuxTest() {}
 
@@ skipping 474 matching lines @@
                   IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
                   kTestInterfaceTun, &buffer);
   EXPECT_FALSE(HandleTunnelMessage(buffer));
 }
 
 // Check AddressTrackerLinux::get_interface_name_ original implementation
 // doesn't crash or return NULL.
 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) {
   InitializeAddressTracker(false);
 
   const IPAddressNumber kEmpty;
   const IPAddressNumber kAddr0(kAddress0, kAddress0 + arraysize(kAddress0));
 
   Buffer buffer;
   MakeAddrMessage(
@@ skipping 12 matching lines @@
 
 TEST_F(AddressTrackerLinuxTest, NonTrackingModeInit) {
   AddressTrackerLinux tracker;
   tracker.Init();
 }
 
 }  // namespace
 
 }  // namespace internal
 }  // namespace net