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

Side by Side Diff: net/dns/dns_config_service_posix_unittest.cc

Issue 1471073010: Removed unused include of winsock.h/inet.h from sys_byteorder.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include inet.h for things other than byte-swap Created 5 years 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
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 <resolv.h> 5 #include <resolv.h>
6 6
7 #include "base/cancelable_callback.h" 7 #include "base/cancelable_callback.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/sys_byteorder.h" 9 #include "base/sys_byteorder.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
11 #include "base/threading/platform_thread.h" 11 #include "base/threading/platform_thread.h"
12 #include "net/dns/dns_config_service_posix.h" 12 #include "net/dns/dns_config_service_posix.h"
13 #include "net/dns/dns_protocol.h" 13 #include "net/dns/dns_protocol.h"
14 14
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
18 #include "base/android/path_utils.h" 18 #include "base/android/path_utils.h"
19 #endif // defined(OS_ANDROID) 19 #endif // defined(OS_ANDROID)
20 20
21 // Required for inet_pton()
22 #if defined(OS_WIN)
23 #include <winsock2.h>
24 #else
25 #include <arpa/inet.h>
26 #endif
27
21 namespace net { 28 namespace net {
22 29
23 #if !defined(OS_ANDROID) 30 #if !defined(OS_ANDROID)
24 31
25 namespace { 32 namespace {
26 33
27 // MAXNS is normally 3, but let's test 4 if possible. 34 // MAXNS is normally 3, but let's test 4 if possible.
28 const char* const kNameserversIPv4[] = { 35 const char* const kNameserversIPv4[] = {
29 "8.8.8.8", 36 "8.8.8.8",
30 "192.168.1.1", 37 "192.168.1.1",
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 WriteMockHostsFile(kTempHosts2); 288 WriteMockHostsFile(kTempHosts2);
282 EXPECT_TRUE(service_->SeenChangeSince(creation_time_)); 289 EXPECT_TRUE(service_->SeenChangeSince(creation_time_));
283 ExpectChange(); 290 ExpectChange();
284 } 291 }
285 292
286 } // namespace internal 293 } // namespace internal
287 294
288 #endif // OS_ANDROID 295 #endif // OS_ANDROID
289 296
290 } // namespace net 297 } // namespace net
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_leveldb_coding.cc ('k') | net/spdy/fuzzing/hpack_fuzz_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698