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

Side by Side Diff: chrome/browser/net/dns_probe_test_util.cc

Issue 655063002: Use uint16 for port numbers more pervasively. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert bad change 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/net/dns_probe_service.cc ('k') | chrome/browser/net/sdch_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/net/dns_probe_test_util.h" 5 #include "chrome/browser/net/dns_probe_test_util.h"
6 6
7 #include "chrome/browser/net/dns_probe_runner.h" 7 #include "chrome/browser/net/dns_probe_runner.h"
8 #include "net/dns/dns_config_service.h" 8 #include "net/dns/dns_config_service.h"
9 #include "net/dns/dns_protocol.h" 9 #include "net/dns/dns_protocol.h"
10 10
11 using net::DnsClient; 11 using net::DnsClient;
12 using net::DnsConfig; 12 using net::DnsConfig;
13 using net::IPAddressNumber; 13 using net::IPAddressNumber;
14 using net::IPEndPoint;
15 using net::MockDnsClientRule; 14 using net::MockDnsClientRule;
16 using net::MockDnsClientRuleList; 15 using net::MockDnsClientRuleList;
17 using net::ParseIPLiteralToNumber; 16 using net::ParseIPLiteralToNumber;
18 17
19 namespace chrome_browser_net { 18 namespace chrome_browser_net {
20 19
21 scoped_ptr<DnsClient> CreateMockDnsClientForProbes( 20 scoped_ptr<DnsClient> CreateMockDnsClientForProbes(
22 MockDnsClientRule::Result result) { 21 MockDnsClientRule::Result result) {
23 DnsConfig config; 22 DnsConfig config;
24 IPAddressNumber dns_ip; 23 IPAddressNumber dns_ip;
25 ParseIPLiteralToNumber("192.168.1.1", &dns_ip); 24 ParseIPLiteralToNumber("192.168.1.1", &dns_ip);
26 const uint16 kDnsPort = net::dns_protocol::kDefaultPort; 25 const uint16 kDnsPort = net::dns_protocol::kDefaultPort;
27 config.nameservers.push_back(IPEndPoint(dns_ip, kDnsPort)); 26 config.nameservers.push_back(net::IPEndPoint(dns_ip, kDnsPort));
28 27
29 const uint16 kTypeA = net::dns_protocol::kTypeA; 28 const uint16 kTypeA = net::dns_protocol::kTypeA;
30 MockDnsClientRuleList rules; 29 MockDnsClientRuleList rules;
31 rules.push_back(MockDnsClientRule(DnsProbeRunner::kKnownGoodHostname, kTypeA, 30 rules.push_back(MockDnsClientRule(DnsProbeRunner::kKnownGoodHostname, kTypeA,
32 result, false)); 31 result, false));
33 32
34 return scoped_ptr<DnsClient>(new net::MockDnsClient(config, rules)); 33 return scoped_ptr<DnsClient>(new net::MockDnsClient(config, rules));
35 } 34 }
36 35
37 } // namespace chrome_browser_net 36 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/dns_probe_service.cc ('k') | chrome/browser/net/sdch_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698