commit 788acd17adf6b3d605b5ea66cf394eb81fc086a9
author pbos@webrtc.org <pbos@webrtc.org> Mon Dec 15 09:41:24 2014
committer pbos@webrtc.org <pbos@webrtc.org> Mon Dec 15 09:41:24 2014
tree 2f08a4f673f34c31cfe1b2ffcf0acabae50b1563
parent fb108b5a28a538862a4157e17de795426d86af1e

Merge audio_processing changes.

R=aluebs@webrtc.org, bjornv@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/32769004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7893 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_processing/audio_processing_impl_unittest.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
index 0957617..f4c36d0 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -27,7 +27,9 @@
   }
 
   MOCK_METHOD0(InitializeLocked, int());
-  int RealInitializeLocked() { return AudioProcessingImpl::InitializeLocked(); }
+  int RealInitializeLocked() NO_THREAD_SAFETY_ANALYSIS {
+    return AudioProcessingImpl::InitializeLocked();
+  }
 };
 
 TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) {