Revert "Pull out the PostFilter to its own NonlinearBeamformer API"

webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h

Index: webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
index e0a1c6fa71f3d8288119249c69f515c6a4977ed3..e2b4417c13ae7f05680dc1f66dff2746cc81fb6d 100644
--- a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
+++ b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
@@ -20,13 +20,12 @@ namespace webrtc {
 
 class MockNonlinearBeamformer : public NonlinearBeamformer {
  public:
-  MockNonlinearBeamformer(const std::vector<Point>& array_geometry,
-                          size_t num_postfilter_channels)
-      : NonlinearBeamformer(array_geometry, num_postfilter_channels) {}
+  explicit MockNonlinearBeamformer(const std::vector<Point>& array_geometry)
+      : NonlinearBeamformer(array_geometry) {}
 
   MOCK_METHOD2(Initialize, void(int chunk_size_ms, int sample_rate_hz));
-  MOCK_METHOD1(AnalyzeChunk, void(const ChannelBuffer<float>& data));
-  MOCK_METHOD1(PostFilter, void(ChannelBuffer<float>* data));
+  MOCK_METHOD2(ProcessChunk, void(const ChannelBuffer<float>& input,
+                                  ChannelBuffer<float>* output));
   MOCK_METHOD1(IsInBeam, bool(const SphericalPointf& spherical_point));
   MOCK_METHOD0(is_target_present, bool());
 };