commit e78bcb97c3b45b19e973d12557310acb16a04b54
author Steve Anton <steveanton@webrtc.org> Tue Oct 31 09:53:08 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 31 17:46:42 2017 +0000
tree 3e9dddc4f4e730c444c7fff3868dbff649e3b648
parent 7995d8cddeaa6529e95b80375742263748ee568a

Enable cpplint in media/

Bug: webrtc:5584
Change-Id: I2fd1395d35596d9002e19cc90fcda3a5d4cde9e7
Reviewed-on: https://webrtc-review.googlesource.com/16564
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20504}

media/engine/webrtcvoiceengine.cc

diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc
index f70093d..e2428cf 100644
--- a/media/engine/webrtcvoiceengine.cc
+++ b/media/engine/webrtcvoiceengine.cc
@@ -16,6 +16,7 @@
 #include <cstdio>
 #include <functional>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "api/call/audio_sink.h"
@@ -77,7 +78,9 @@
 
 class ProxySink : public webrtc::AudioSinkInterface {
  public:
-  ProxySink(AudioSinkInterface* sink) : sink_(sink) { RTC_DCHECK(sink); }
+  explicit ProxySink(AudioSinkInterface* sink) : sink_(sink) {
+    RTC_DCHECK(sink);
+  }
 
   void OnData(const Data& audio) override { sink_->OnData(audio); }
 
@@ -418,7 +421,7 @@
           "WebRTC-Audio-MinimizeResamplingOnMobile")) {
     options.auto_gain_control = rtc::Optional<bool>(false);
     LOG(LS_INFO) << "Disable AGC according to field trial.";
-    if (!(options.noise_suppression.value_or(false) or
+    if (!(options.noise_suppression.value_or(false) ||
           options.echo_cancellation.value_or(false))) {
       // If possible, turn off the high-pass filter.
       LOG(LS_INFO) << "Disable high-pass filter in response to field trial.";