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

Side by Side Diff: net/base/network_interfaces_unittest.cc

Issue 1162973005: Stop including ip_address_number.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove some header sorting changes, seems to be breaking windows Created 5 years, 6 months 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 unified diff | Download patch
« no previous file with comments | « net/base/network_interfaces_mac.cc ('k') | net/cert/x509_certificate_openssl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/network_interfaces.h" 5 #include "net/base/network_interfaces.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include <ostream> 9 #include <ostream>
10 10
11 // TODO(eroman): Remove unneeeded headers. 11 // TODO(eroman): Remove unneeeded headers.
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/format_macros.h" 13 #include "base/format_macros.h"
14 #include "base/scoped_native_library.h" 14 #include "base/scoped_native_library.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/sys_byteorder.h" 19 #include "base/sys_byteorder.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "net/base/ip_endpoint.h" 21 #include "net/base/ip_endpoint.h"
22 #include "net/base/net_util.h"
22 23
23 #if !defined(OS_NACL) && !defined(OS_WIN) 24 #if !defined(OS_NACL) && !defined(OS_WIN)
24 #include <net/if.h> 25 #include <net/if.h>
25 #include <netinet/in.h> 26 #include <netinet/in.h>
26 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
27 #include <ifaddrs.h> 28 #include <ifaddrs.h>
28 #if !defined(OS_IOS) 29 #if !defined(OS_IOS)
29 #include <netinet/in_var.h> 30 #include <netinet/in_var.h>
30 #endif // !OS_IOS 31 #endif // !OS_IOS
31 #endif // OS_MACOSX 32 #endif // OS_MACOSX
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 TryChangeWifiOptions(0); 746 TryChangeWifiOptions(0);
746 TryChangeWifiOptions(WIFI_OPTIONS_DISABLE_SCAN); 747 TryChangeWifiOptions(WIFI_OPTIONS_DISABLE_SCAN);
747 TryChangeWifiOptions(WIFI_OPTIONS_MEDIA_STREAMING_MODE); 748 TryChangeWifiOptions(WIFI_OPTIONS_MEDIA_STREAMING_MODE);
748 TryChangeWifiOptions(WIFI_OPTIONS_DISABLE_SCAN | 749 TryChangeWifiOptions(WIFI_OPTIONS_DISABLE_SCAN |
749 WIFI_OPTIONS_MEDIA_STREAMING_MODE); 750 WIFI_OPTIONS_MEDIA_STREAMING_MODE);
750 } 751 }
751 752
752 } // namespace 753 } // namespace
753 754
754 } // namespace net 755 } // namespace net
OLDNEW
« no previous file with comments | « net/base/network_interfaces_mac.cc ('k') | net/cert/x509_certificate_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698