Remove usage of VoEVolumeControl from WVoE and Audio[Send|Receive]Stream.

webrtc/media/engine/webrtcvoe.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
 #define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
 
 #include <memory>
 
 #include "webrtc/media/engine/webrtccommon.h"
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/include/voe_codec.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/include/voe_hardware.h"
-#include "webrtc/voice_engine/include/voe_volume_control.h"
 
 namespace cricket {
 // automatically handles lifetime of WebRtc VoiceEngine
 class scoped_voe_engine {
  public:
   explicit scoped_voe_engine(webrtc::VoiceEngine* e) : ptr(e) {}
   // RTC_DCHECK, to ensure that there are no leaks at shutdown
   ~scoped_voe_engine() {
     if (ptr) {
       const bool success = webrtc::VoiceEngine::Delete(ptr);
@@ skipping 36 matching lines @@
  private:
   T* ptr;
 };
 
 // Utility class for aggregating the various WebRTC interface.
 // Fake implementations can also be injected for testing.
 class VoEWrapper {
  public:
   VoEWrapper()
       : engine_(webrtc::VoiceEngine::Create()),
-        base_(engine_), codec_(engine_), hw_(engine_),
-        volume_(engine_) {
+        base_(engine_), codec_(engine_), hw_(engine_) {
   }
   VoEWrapper(webrtc::VoEBase* base,
              webrtc::VoECodec* codec,
-             webrtc::VoEHardware* hw,
-             webrtc::VoEVolumeControl* volume)
+             webrtc::VoEHardware* hw)
       : engine_(NULL),
         base_(base),
         codec_(codec),
-        hw_(hw),
-        volume_(volume) {
+        hw_(hw) {
   }
   ~VoEWrapper() {}
   webrtc::VoiceEngine* engine() const { return engine_.get(); }
   webrtc::VoEBase* base() const { return base_.get(); }
   webrtc::VoECodec* codec() const { return codec_.get(); }
   webrtc::VoEHardware* hw() const { return hw_.get(); }
-  webrtc::VoEVolumeControl* volume() const { return volume_.get(); }
   int error() { return base_->LastError(); }
 
  private:
   scoped_voe_engine engine_;
   scoped_voe_ptr<webrtc::VoEBase> base_;
   scoped_voe_ptr<webrtc::VoECodec> codec_;
   scoped_voe_ptr<webrtc::VoEHardware> hw_;
-  scoped_voe_ptr<webrtc::VoEVolumeControl> volume_;
 };
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_