Fix MDnsClient's cache entry cleanup logic.

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 <map>
+#include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_vector.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"
 
+namespace base {
+class Clock;
+class Timer;
+}  // namespace base
+
 namespace net {
 
 class MDnsSocketFactoryImpl : public MDnsSocketFactory {
  public:
-  MDnsSocketFactoryImpl() {};
+  MDnsSocketFactoryImpl() {}
   ~MDnsSocketFactoryImpl() override{};
 
   void CreateSockets(ScopedVector<DatagramServerSocket>* sockets) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MDnsSocketFactoryImpl);
 };
 
 // A connection to the network for multicast DNS clients. It reads data into
 // DnsResponse objects and alerts the delegate that a packet has been received.
@@ skipping 86 matching lines @@
     // Query the cache for records of a specific type and name.
     void QueryCache(uint16 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::map<ListenerKey, 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);
 
     // Clean up the cache and schedule a new cleanup.
     void DoCleanup();
 
     // Callback for when a record is removed from the cache.
     void OnRecordRemoved(const RecordParsed* record);
 
     void NotifyNsecRecord(const RecordParsed* record);
 
     // Delete and erase the observer list for |key|. Only deletes the observer
     // list if is empty.
     void CleanupObserverList(const ListenerKey& key);
 
+    void set_cleanup_timer_for_test(scoped_ptr<base::Timer> timer);
+
+    void set_clock_for_test(scoped_ptr<base::Clock> clock);
+
     ListenerMap listeners_;
 
     MDnsCache cache_;
 
-    base::CancelableClosure cleanup_callback_;
+    scoped_ptr<base::Clock> clock_;
+    scoped_ptr<base::Timer> cleanup_timer_;
     base::Time scheduled_cleanup_;
 
     scoped_ptr<MDnsConnection> connection_;
 
     DISALLOW_COPY_AND_ASSIGN(Core);
   };
 
   MDnsClientImpl();
   ~MDnsClientImpl() override;
 
@@ skipping 126 matching lines @@
   MDnsClientImpl* client_;
 
   bool started_;
   int flags_;
 
   DISALLOW_COPY_AND_ASSIGN(MDnsTransactionImpl);
 };
 
 }  // namespace net
 #endif  // NET_DNS_MDNS_CLIENT_IMPL_H_