Simplify webrtc::voe::MonitorModule and remove the .cc file.

webrtc/voice_engine/monitor_module.h

Index: webrtc/voice_engine/monitor_module.h
diff --git a/webrtc/voice_engine/monitor_module.h b/webrtc/voice_engine/monitor_module.h
index f026f725d504379b0972f3556ad0506723c6a195..674e37abd77362c7505670584a3be6a580a08fae 100644
--- a/webrtc/voice_engine/monitor_module.h
+++ b/webrtc/voice_engine/monitor_module.h
@@ -11,47 +11,28 @@
 #ifndef WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 #define WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module.h"
-#include "webrtc/typedefs.h"
-#include "webrtc/voice_engine/voice_engine_defines.h"
-
-class MonitorObserver
-{
-public:
-    virtual void OnPeriodicProcess() = 0;
-protected:
-    virtual ~MonitorObserver() {}
-};
-
 
 namespace webrtc {
 namespace voe {
 
-class MonitorModule : public Module
-{
-public:
-    int32_t RegisterObserver(MonitorObserver& observer);
-
-    int32_t DeRegisterObserver();
+// When associated with a ProcessThread, calls a callback method
+// |OnPeriodicProcess()| implemented by the |Observer|.
+// TODO(tommi): This could be replaced with PostDelayedTask().
+template <typename Observer>
+class MonitorModule : public Module {
+ public:
+  explicit MonitorModule(Observer* observer) : observer_(observer) {}
+  ~MonitorModule() override {}
 
-    MonitorModule();
+ private:
+  int64_t TimeUntilNextProcess() override { return 1000; }
+  void Process() override { observer_->OnPeriodicProcess(); }

[henrika_webrtc, 2017/02/28 08:24:21]

To me it looks like TransmitMixer::OnPeridodicProcess contains e.g
VE_TYPING_NOISE_OFF_WARNING and VE_SATURATION_WARNING. Instead of improving this
class even more (by using delayed PostTask), it might be worth considering if it
can be removed completely. Henrik L should know if any of the callbacks are used
today.

[tommi, 2017/02/28 08:38:41]

Good point... I looked around for VE_SATURATION_WARNING and all I can find is
this:

    printf("  SATURATION WARNING \n");

in voe_cmd_test.cc

It would be good to delete this if it's not being used.  We'd get rid of one
lock inside of TransmitMixer::ProcessAudio.  Added a TODO for now in this file,
with details.

 
-    virtual ~MonitorModule();
-public:	// module
- int64_t TimeUntilNextProcess() override;
-
- void Process() override;
-
-private:
-    rtc::CriticalSection _callbackCritSect;
-    MonitorObserver* _observerPtr GUARDED_BY(_callbackCritSect);
-    int64_t _lastProcessTime;
+  Observer* const observer_;
 };
 
 }  // namespace voe
-
 }  // namespace webrtc
 
-#endif // VOICE_ENGINE_MONITOR_MODULE
+#endif  // VOICE_ENGINE_MONITOR_MODULE