From 8cf8898973560181152d329f9f47b5070dcbf2ee Mon Sep 17 00:00:00 2001
From: kwiberg <kwiberg@webrtc.org>
Date: Fri, 26 Aug 2016 14:50:38 -0700
Subject: [PATCH] Fix Chromium clang plugin warnings

BUG=webrtc:163

Review-Url: https://codereview.webrtc.org/2285713002
Cr-Commit-Position: refs/heads/master@{#13943}
---
 webrtc/modules/audio_processing/BUILD.gn                  | 4 ----
 webrtc/modules/audio_processing/agc/agc.cc                | 8 ++++++++
 webrtc/modules/audio_processing/agc/agc.h                 | 7 ++-----
 .../audio_processing/vad/voice_activity_detector.cc       | 2 ++
 .../audio_processing/vad/voice_activity_detector.h        | 1 +
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index 97705c69c5..5deaecbf84 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -453,10 +453,6 @@ if (rtc_include_tests) {
       "//testing/gtest",
       "//third_party/gflags",
     ]
-    if (is_clang) {
-      # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
-      configs -= [ "//build/config/clang:find_bad_constructs" ]
-    }
   }
 
   executable("click_annotate") {
diff --git a/webrtc/modules/audio_processing/agc/agc.cc b/webrtc/modules/audio_processing/agc/agc.cc
index 9de1705962..2bff7359f8 100644
--- a/webrtc/modules/audio_processing/agc/agc.cc
+++ b/webrtc/modules/audio_processing/agc/agc.cc
@@ -97,4 +97,12 @@ int Agc::set_target_level_dbfs(int level) {
   return 0;
 }
 
+int Agc::target_level_dbfs() const {
+  return target_level_dbfs_;
+}
+
+float Agc::voice_probability() const {
+  return vad_.last_voice_probability();
+}
+
 }  // namespace webrtc
diff --git a/webrtc/modules/audio_processing/agc/agc.h b/webrtc/modules/audio_processing/agc/agc.h
index 59faba6866..e681e376de 100644
--- a/webrtc/modules/audio_processing/agc/agc.h
+++ b/webrtc/modules/audio_processing/agc/agc.h
@@ -40,11 +40,8 @@ class Agc {
   virtual void Reset();
 
   virtual int set_target_level_dbfs(int level);
-  virtual int target_level_dbfs() const { return target_level_dbfs_; }
-
-  virtual float voice_probability() const {
-    return vad_.last_voice_probability();
-  }
+  virtual int target_level_dbfs() const;
+  virtual float voice_probability() const;
 
  private:
   double target_level_loudness_;
diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc
index fc9d103918..7b495f4231 100644
--- a/webrtc/modules/audio_processing/vad/voice_activity_detector.cc
+++ b/webrtc/modules/audio_processing/vad/voice_activity_detector.cc
@@ -31,6 +31,8 @@ VoiceActivityDetector::VoiceActivityDetector()
       standalone_vad_(StandaloneVad::Create()) {
 }
 
+VoiceActivityDetector::~VoiceActivityDetector() = default;
+
 // Because ISAC has a different chunk length, it updates
 // |chunkwise_voice_probabilities_| and |chunkwise_rms_| when there is new data.
 // Otherwise it clears them.
diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.h b/webrtc/modules/audio_processing/vad/voice_activity_detector.h
index 25f10dd2eb..5fb5e59794 100644
--- a/webrtc/modules/audio_processing/vad/voice_activity_detector.h
+++ b/webrtc/modules/audio_processing/vad/voice_activity_detector.h
@@ -27,6 +27,7 @@ namespace webrtc {
 class VoiceActivityDetector {
  public:
   VoiceActivityDetector();
+  ~VoiceActivityDetector();
 
   // Processes each audio chunk and estimates the voice probability. The maximum
   // supported sample rate is 32kHz.