diff options
| author | Avi Drissman <avi@chromium.org> | 2015-12-19 23:40:46 -0500 |
|---|---|---|
| committer | Avi Drissman <avi@chromium.org> | 2015-12-20 04:42:28 +0000 |
| commit | 13fc893acb88fdd82ad7eea72f9499d123bf5a89 (patch) | |
| tree | 76aa2bdaa56cb2d05bbf2a6af57e440f9661c7f0 /net/dns/dns_test_util.cc | |
| parent | e40cbca89ebc83b5bef0f892d80604b00a98abc8 (diff) | |
| download | chromium_src-13fc893acb88fdd82ad7eea72f9499d123bf5a89.zip chromium_src-13fc893acb88fdd82ad7eea72f9499d123bf5a89.tar.gz chromium_src-13fc893acb88fdd82ad7eea72f9499d123bf5a89.tar.bz2 | |
Switch to standard integer types in net/.
BUG=488550
TBR=mmenke@chromium.org
Review URL: https://codereview.chromium.org/1535363003 .
Cr-Commit-Position: refs/heads/master@{#366297}
Diffstat (limited to 'net/dns/dns_test_util.cc')
| -rw-r--r-- | net/dns/dns_test_util.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc index 6b2bdfb..de91048 100644 --- a/net/dns/dns_test_util.cc +++ b/net/dns/dns_test_util.cc @@ -41,7 +41,7 @@ class MockTransaction : public DnsTransaction, public: MockTransaction(const MockDnsClientRuleList& rules, const std::string& hostname, - uint16 qtype, + uint16_t qtype, const DnsTransactionFactory::CallbackType& callback) : result_(MockDnsClientRule::FAIL), hostname_(hostname), @@ -64,7 +64,7 @@ class MockTransaction : public DnsTransaction, const std::string& GetHostname() const override { return hostname_; } - uint16 GetType() const override { return qtype_; } + uint16_t GetType() const override { return qtype_; } void Start() override { EXPECT_FALSE(started_); @@ -102,10 +102,10 @@ class MockTransaction : public DnsTransaction, header->flags |= dns_protocol::kFlagResponse; if (MockDnsClientRule::OK == result_) { - const uint16 kPointerToQueryName = - static_cast<uint16>(0xc000 | sizeof(*header)); + const uint16_t kPointerToQueryName = + static_cast<uint16_t>(0xc000 | sizeof(*header)); - const uint32 kTTL = 86400; // One day. + const uint32_t kTTL = 86400; // One day. // Size of RDATA which is a IPv4 or IPv6 address. size_t rdata_size = qtype_ == dns_protocol::kTypeA ? kIPv4AddressSize @@ -122,7 +122,7 @@ class MockTransaction : public DnsTransaction, writer.WriteU16(qtype_); writer.WriteU16(dns_protocol::kClassIN); writer.WriteU32(kTTL); - writer.WriteU16(static_cast<uint16>(rdata_size)); + writer.WriteU16(static_cast<uint16_t>(rdata_size)); if (qtype_ == dns_protocol::kTypeA) { char kIPv4Loopback[] = { 0x7f, 0, 0, 1 }; writer.WriteBytes(kIPv4Loopback, sizeof(kIPv4Loopback)); @@ -150,7 +150,7 @@ class MockTransaction : public DnsTransaction, MockDnsClientRule::Result result_; const std::string hostname_; - const uint16 qtype_; + const uint16_t qtype_; DnsTransactionFactory::CallbackType callback_; bool started_; bool delayed_; @@ -168,7 +168,7 @@ class MockTransactionFactory : public DnsTransactionFactory { scoped_ptr<DnsTransaction> CreateTransaction( const std::string& hostname, - uint16 qtype, + uint16_t qtype, const DnsTransactionFactory::CallbackType& callback, const BoundNetLog&) override { MockTransaction* transaction = |