Make experimental NS API not purely virtual

Because not all subclasses will want to bother overriding these methods.

R=bjornv@webrtc.org, kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6592 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index de387ed..cc2b5c0 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -303,10 +303,6 @@
     (*it)->SetExtraOptions(config);
 }
 
-int AudioProcessingImpl::EnableExperimentalNs(bool enable) {
-  return kNoError;
-}
-
 int AudioProcessingImpl::input_sample_rate_hz() const {
   CriticalSectionScoped crit_scoped(crit_);
   return fwd_in_format_.rate();
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index d34f305..9753423 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -92,10 +92,6 @@
                          ChannelLayout output_layout,
                          ChannelLayout reverse_layout) OVERRIDE;
   virtual void SetExtraOptions(const Config& config) OVERRIDE;
-  virtual int EnableExperimentalNs(bool enable) OVERRIDE;
-  virtual bool experimental_ns_enabled() const OVERRIDE {
-    return false;
-  }
   virtual int set_sample_rate_hz(int rate) OVERRIDE;
   virtual int input_sample_rate_hz() const OVERRIDE;
   virtual int sample_rate_hz() const OVERRIDE;
diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h
index 1e494d1..6f4cc9e 100644
--- a/webrtc/modules/audio_processing/include/audio_processing.h
+++ b/webrtc/modules/audio_processing/include/audio_processing.h
@@ -209,8 +209,8 @@
   // ensures the options are applied immediately.
   virtual void SetExtraOptions(const Config& config) = 0;
 
-  virtual int EnableExperimentalNs(bool enable) = 0;
-  virtual bool experimental_ns_enabled() const = 0;
+  virtual int EnableExperimentalNs(bool enable) { return kNoError; }
+  virtual bool experimental_ns_enabled() const { return false; }
 
   // DEPRECATED.
   // TODO(ajm): Remove after Chromium has upgraded to using Initialize().
diff --git a/webrtc/modules/audio_processing/include/mock_audio_processing.h b/webrtc/modules/audio_processing/include/mock_audio_processing.h
index c1ac23a..8258bb6 100644
--- a/webrtc/modules/audio_processing/include/mock_audio_processing.h
+++ b/webrtc/modules/audio_processing/include/mock_audio_processing.h
@@ -186,10 +186,6 @@
           ChannelLayout reverse_layout));
   MOCK_METHOD1(SetExtraOptions,
       void(const Config& config));
-  MOCK_METHOD1(EnableExperimentalNs,
-      int(bool enable));
-  MOCK_CONST_METHOD0(experimental_ns_enabled,
-      bool());
   MOCK_METHOD1(set_sample_rate_hz,
       int(int rate));
   MOCK_CONST_METHOD0(input_sample_rate_hz,