Revert of Improving the fake clock and using it to fix a flaky STUN timeout test.

webrtc/base/messagequeue.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 19 matching lines @@
 #include "webrtc/base/timeutils.h"
 #include "webrtc/base/thread_annotations.h"
 
 namespace rtc {
 
 struct Message;
 class MessageQueue;
 
 // MessageQueueManager does cleanup of of message queues
 
-class MessageQueueManager {
+class MessageQueueManager : public MessageHandler {
  public:
   static void Add(MessageQueue *message_queue);
   static void Remove(MessageQueue *message_queue);
   static void Clear(MessageHandler *handler);
 
   // For testing purposes, we expose whether or not the MessageQueueManager
   // instance has been initialized. It has no other use relative to the rest of
   // the functions of this class, which auto-initialize the underlying
   // MessageQueueManager instance when necessary.
   static bool IsInitialized();
 
   // Mainly for testing purposes, for use with a simulated clock.
-  // Ensures that all message queues have processed delayed messages
-  // up until the current point in time.
-  static void ProcessAllMessageQueues();
+  // Posts a no-op event on all message queues so they will wake from the
+  // socket server select() and process messages again.
+  static void WakeAllMessageQueues();
 
  private:
   static MessageQueueManager* Instance();
 
   MessageQueueManager();
-  ~MessageQueueManager();
+  ~MessageQueueManager() override;
 
   void AddInternal(MessageQueue *message_queue);
   void RemoveInternal(MessageQueue *message_queue);
   void ClearInternal(MessageHandler *handler);
-  void ProcessAllMessageQueuesInternal();
+  void WakeAllMessageQueuesInternal();
+  void OnMessage(Message* pmsg) override;
 
   static MessageQueueManager* instance_;
   // This list contains all live MessageQueues.
   std::vector<MessageQueue *> message_queues_;
   CriticalSection crit_;
 };
 
 // Derive from this for specialized data
 // App manages lifetime, except when messages are purged
 
@@ skipping 218 matching lines @@
   // Used if SocketServer ownership lies with |this|.
   std::unique_ptr<SocketServer> own_ss_;
   SharedExclusiveLock ss_lock_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MessageQueue);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_MESSAGEQUEUE_H_