Switch to standard integer types in net/.

net/dns/mdns_client_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DNS_MDNS_CLIENT_IMPL_H_
 #define NET_DNS_MDNS_CLIENT_IMPL_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/mdns_cache.h"
 #include "net/dns/mdns_client.h"
 #include "net/udp/datagram_server_socket.h"
 #include "net/udp/udp_server_socket.h"
 #include "net/udp/udp_socket.h"
 
@@ skipping 91 matching lines @@
   // invalidate the core.
   class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate {
    public:
     Core(base::Clock* clock, base::Timer* timer);
     ~Core() override;
 
     // Initialize the core. Returns true on success.
     bool Init(MDnsSocketFactory* socket_factory);
 
     // Send a query with a specific rrtype and name. Returns true on success.
-    bool SendQuery(uint16 rrtype, const std::string& name);
+    bool SendQuery(uint16_t rrtype, const std::string& name);
 
     // Add/remove a listener to the list of listeners.
     void AddListener(MDnsListenerImpl* listener);
     void RemoveListener(MDnsListenerImpl* listener);
 
     // Query the cache for records of a specific type and name.
-    void QueryCache(uint16 rrtype, const std::string& name,
+    void QueryCache(uint16_t rrtype,
+                    const std::string& name,
                     std::vector<const RecordParsed*>* records) const;
 
     // Parse the response and alert relevant listeners.
     void HandlePacket(DnsResponse* response, int bytes_read) override;
 
     void OnConnectionError(int error) override;
 
    private:
     FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
 
-    typedef std::pair<std::string, uint16> ListenerKey;
+    typedef std::pair<std::string, uint16_t> ListenerKey;
     typedef std::map<ListenerKey, base::ObserverList<MDnsListenerImpl>*>
         ListenerMap;
 
     // Alert listeners of an update to the cache.
     void AlertListeners(MDnsCache::UpdateType update_type,
                         const ListenerKey& key, const RecordParsed* record);
 
     // Schedule a cache cleanup to a specific time, cancelling other cleanups.
     void ScheduleCleanup(base::Time cleanup);
 
@@ skipping 20 matching lines @@
     scoped_ptr<MDnsConnection> connection_;
 
     DISALLOW_COPY_AND_ASSIGN(Core);
   };
 
   MDnsClientImpl();
   ~MDnsClientImpl() override;
 
   // MDnsClient implementation:
   scoped_ptr<MDnsListener> CreateListener(
-      uint16 rrtype,
+      uint16_t rrtype,
       const std::string& name,
       MDnsListener::Delegate* delegate) override;
 
   scoped_ptr<MDnsTransaction> CreateTransaction(
-      uint16 rrtype,
+      uint16_t rrtype,
       const std::string& name,
       int flags,
       const MDnsTransaction::ResultCallback& callback) override;
 
   bool StartListening(MDnsSocketFactory* socket_factory) override;
   void StopListening() override;
   bool IsListening() const override;
 
   Core* core() { return core_.get(); }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MDnsTest, CacheCleanupWithShortTTL);
 
   // Test constructor, takes a mock clock and mock timer.
   MDnsClientImpl(scoped_ptr<base::Clock> clock,
                  scoped_ptr<base::Timer> cleanup_timer);
 
   scoped_ptr<Core> core_;
   scoped_ptr<base::Clock> clock_;
   scoped_ptr<base::Timer> cleanup_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(MDnsClientImpl);
 };
 
 class MDnsListenerImpl : public MDnsListener,
                          public base::SupportsWeakPtr<MDnsListenerImpl> {
  public:
-  MDnsListenerImpl(uint16 rrtype,
+  MDnsListenerImpl(uint16_t rrtype,
                    const std::string& name,
                    base::Clock* clock,
                    MDnsListener::Delegate* delegate,
                    MDnsClientImpl* client);
 
   ~MDnsListenerImpl() override;
 
   // MDnsListener implementation:
   bool Start() override;
 
   // Actively refresh any received records.
   void SetActiveRefresh(bool active_refresh) override;
 
   const std::string& GetName() const override;
 
-  uint16 GetType() const override;
+  uint16_t GetType() const override;
 
   MDnsListener::Delegate* delegate() { return delegate_; }
 
   // Alert the delegate of a record update.
   void HandleRecordUpdate(MDnsCache::UpdateType update_type,
                           const RecordParsed* record_parsed);
 
   // Alert the delegate of the existence of an Nsec record.
   void AlertNsecRecord();
 
  private:
   void ScheduleNextRefresh();
   void DoRefresh();
 
-  uint16 rrtype_;
+  uint16_t rrtype_;
   std::string name_;
   base::Clock* clock_;
   MDnsClientImpl* client_;
   MDnsListener::Delegate* delegate_;
 
   base::Time last_update_;
-  uint32 ttl_;
+  uint32_t ttl_;
   bool started_;
   bool active_refresh_;
 
   base::CancelableClosure next_refresh_;
   DISALLOW_COPY_AND_ASSIGN(MDnsListenerImpl);
 };
 
 class MDnsTransactionImpl : public base::SupportsWeakPtr<MDnsTransactionImpl>,
                             public MDnsTransaction,
                             public MDnsListener::Delegate {
  public:
-  MDnsTransactionImpl(uint16 rrtype,
+  MDnsTransactionImpl(uint16_t rrtype,
                       const std::string& name,
                       int flags,
                       const MDnsTransaction::ResultCallback& callback,
                       MDnsClientImpl* client);
   ~MDnsTransactionImpl() override;
 
   // MDnsTransaction implementation:
   bool Start() override;
 
   const std::string& GetName() const override;
-  uint16 GetType() const override;
+  uint16_t GetType() const override;
 
   // MDnsListener::Delegate implementation:
   void OnRecordUpdate(MDnsListener::UpdateType update,
                       const RecordParsed* record) override;
   void OnNsecRecord(const std::string& name, unsigned type) override;
 
   void OnCachePurged() override;
 
  private:
   bool is_active() { return !callback_.is_null(); }
@@ skipping 12 matching lines @@
 
   // Reads records from the cache and calls the callback for every
   // record read.
   void ServeRecordsFromCache();
 
   // Send a query to the network and set up a timeout to time out the
   // transaction. Returns false if it fails to start listening on the network
   // or if it fails to send a query.
   bool QueryAndListen();
 
-  uint16 rrtype_;
+  uint16_t rrtype_;
   std::string name_;
   MDnsTransaction::ResultCallback callback_;
 
   scoped_ptr<MDnsListener> listener_;
   base::CancelableCallback<void()> timeout_;
 
   MDnsClientImpl* client_;
 
   bool started_;
   int flags_;
 
   DISALLOW_COPY_AND_ASSIGN(MDnsTransactionImpl);
 };
 
 }  // namespace net
 #endif  // NET_DNS_MDNS_CLIENT_IMPL_H_