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

Unified Diff: net/base/net_util_linux.h

Issue 734063004: Update from https://crrev.com/304418 (Closed) Base URL: https://github.com/domokit/mojo.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
« no previous file with comments | « net/base/net_log_util.cc ('k') | net/base/net_util_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_linux.h
diff --git a/net/base/net_util_posix.h b/net/base/net_util_linux.h
similarity index 72%
copy from net/base/net_util_posix.h
copy to net/base/net_util_linux.h
index b553d1c9144dde677c8fe5aa1036104edd542498..340c3802eea080878a82db44a6b989a6c329971b 100644
--- a/net/base/net_util_posix.h
+++ b/net/base/net_util_linux.h
@@ -2,16 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef NET_BASE_NET_UTIL_POSIX_H_
-#define NET_BASE_NET_UTIL_POSIX_H_
+#ifndef NET_BASE_NET_UTIL_LINUX_H_
+#define NET_BASE_NET_UTIL_LINUX_H_
// This file is only used to expose some of the internals
-// of net_util_posix.cc to tests.
+// of net_util_linux.cc to tests.
+
+#include "base/containers/hash_tables.h"
+#include "net/base/address_tracker_linux.h"
+#include "net/base/net_util.h"
namespace net {
namespace internal {
-#if !defined(OS_MACOSX) && !defined(OS_NACL)
typedef char* (*GetInterfaceNameFunction)(unsigned int interface_index,
char* ifname);
@@ -22,10 +25,7 @@ NET_EXPORT bool GetNetworkListImpl(
const internal::AddressTrackerLinux::AddressMap& address_map,
GetInterfaceNameFunction get_interface_name);
-#endif // !OS_MACOSX && !OS_NACL
-
} // namespace internal
-
} // namespace net
-#endif // NET_BASE_NET_UTIL_POSIX_H_
+#endif // NET_BASE_NET_UTIL_LINUX_H_
« no previous file with comments | « net/base/net_log_util.cc ('k') | net/base/net_util_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698