Moving/renaming webrtc/common.h.

webrtc/voice_engine/voice_engine_impl.h

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 65 matching lines @@
                         public VoERTP_RTCPImpl,
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
                         public VoEVideoSyncImpl,
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
                         public VoEVolumeControlImpl,
 #endif
                         public VoEBaseImpl {
  public:
-  VoiceEngineImpl(const Config* config, bool owns_config)
-      : SharedData(*config),
+  VoiceEngineImpl()
+      : SharedData(),
 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
         VoEAudioProcessingImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
         VoECodecImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
         VoEExternalMediaImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
         VoEFileImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
         VoEHardwareImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
         VoENetEqStatsImpl(this),
 #endif
         VoENetworkImpl(this),
 #ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
         VoERTP_RTCPImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
         VoEVideoSyncImpl(this),
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
         VoEVolumeControlImpl(this),
 #endif
         VoEBaseImpl(this),
-        _ref_count(0),
-        own_config_(owns_config ? config : NULL) {
-  }
+        _ref_count(0) {}
   ~VoiceEngineImpl() override { assert(_ref_count.Value() == 0); }
 
   int AddRef();
 
   // This implements the Release() method for all the inherited interfaces.
   int Release() override;
 
   // Backdoor to access a voe::Channel object without a channel ID. This is only
   // to be used while refactoring the VoE API!
   virtual std::unique_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id);
 
  // This is *protected* so that FakeVoiceEngine can inherit from the class and
  // manipulate the reference count. See: fake_voice_engine.h.
  protected:
   Atomic32 _ref_count;
- private:
-  std::unique_ptr<const Config> own_config_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H