Switch to standard integer types in net/.

net/dns/mdns_client_impl.cc

Index: net/dns/mdns_client_impl.cc
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index 73e8de40e6b82cf9b3a358fb814d949eb8bfcfe1..9782ddd9939b2ea6bb71df9f983ed1195bda6564 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -215,7 +215,7 @@ bool MDnsClientImpl::Core::Init(MDnsSocketFactory* socket_factory) {
   return connection_->Init(socket_factory);
 }
 
-bool MDnsClientImpl::Core::SendQuery(uint16 rrtype, const std::string& name) {
+bool MDnsClientImpl::Core::SendQuery(uint16_t rrtype, const std::string& name) {
   std::string name_dns;
   if (!DNSDomainFromDot(name, &name_dns))
     return false;
@@ -421,7 +421,8 @@ void MDnsClientImpl::Core::OnRecordRemoved(
 }
 
 void MDnsClientImpl::Core::QueryCache(
-    uint16 rrtype, const std::string& name,
+    uint16_t rrtype,
+    const std::string& name,
     std::vector<const RecordParsed*>* records) const {
   cache_.FindDnsRecords(rrtype, name, records, clock_->Now());
 }
@@ -458,7 +459,7 @@ bool MDnsClientImpl::IsListening() const {
 }
 
 scoped_ptr<MDnsListener> MDnsClientImpl::CreateListener(
-    uint16 rrtype,
+    uint16_t rrtype,
     const std::string& name,
     MDnsListener::Delegate* delegate) {
   return scoped_ptr<MDnsListener>(
@@ -466,7 +467,7 @@ scoped_ptr<MDnsListener> MDnsClientImpl::CreateListener(
 }
 
 scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction(
-    uint16 rrtype,
+    uint16_t rrtype,
     const std::string& name,
     int flags,
     const MDnsTransaction::ResultCallback& callback) {
@@ -474,7 +475,7 @@ scoped_ptr<MDnsTransaction> MDnsClientImpl::CreateTransaction(
       new MDnsTransactionImpl(rrtype, name, flags, callback, this));
 }
 
-MDnsListenerImpl::MDnsListenerImpl(uint16 rrtype,
+MDnsListenerImpl::MDnsListenerImpl(uint16_t rrtype,
                                    const std::string& name,
                                    base::Clock* clock,
                                    MDnsListener::Delegate* delegate,
@@ -485,8 +486,7 @@ MDnsListenerImpl::MDnsListenerImpl(uint16 rrtype,
       client_(client),
       delegate_(delegate),
       started_(false),
-      active_refresh_(false) {
-}
+      active_refresh_(false) {}
 
 MDnsListenerImpl::~MDnsListenerImpl() {
   if (started_) {
@@ -522,7 +522,7 @@ const std::string& MDnsListenerImpl::GetName() const {
   return name_;
 }
 
-uint16 MDnsListenerImpl::GetType() const {
+uint16_t MDnsListenerImpl::GetType() const {
   return rrtype_;
 }
 
@@ -605,13 +605,17 @@ void MDnsListenerImpl::DoRefresh() {
 }
 
 MDnsTransactionImpl::MDnsTransactionImpl(
-    uint16 rrtype,
+    uint16_t rrtype,
     const std::string& name,
     int flags,
     const MDnsTransaction::ResultCallback& callback,
     MDnsClientImpl* client)
-    : rrtype_(rrtype), name_(name), callback_(callback), client_(client),
-      started_(false), flags_(flags) {
+    : rrtype_(rrtype),
+      name_(name),
+      callback_(callback),
+      client_(client),
+      started_(false),
+      flags_(flags) {
   DCHECK((flags_ & MDnsTransaction::FLAG_MASK) == flags_);
   DCHECK(flags_ & MDnsTransaction::QUERY_CACHE ||
          flags_ & MDnsTransaction::QUERY_NETWORK);
@@ -646,7 +650,7 @@ const std::string& MDnsTransactionImpl::GetName() const {
   return name_;
 }
 
-uint16 MDnsTransactionImpl::GetType() const {
+uint16_t MDnsTransactionImpl::GetType() const {
   return rrtype_;
 }