Replace the DestroyDeviceInfo with a virtual destructor.

Review URL: http://webrtc-codereview.appspot.com/212005

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

src/modules/video_capture/main/interface/video_capture.h

@@ -72,7 +72,6 @@ class VideoCaptureModule: public RefCountedModule {
         WebRtc_UWord32 positionX,
         WebRtc_UWord32 positionY) = 0;
 
-  protected:
     virtual ~DeviceInfo() {}
   };
 

src/modules/video_capture/main/interface/video_capture_factory.h

@@ -35,7 +35,6 @@ class VideoCaptureFactory {
 
   static VideoCaptureModule::DeviceInfo* CreateDeviceInfo(
       const WebRtc_Word32 id);
-  static void DestroyDeviceInfo(VideoCaptureModule::DeviceInfo* deviceInfo);
 
  private:
   ~VideoCaptureFactory();

src/modules/video_capture/main/source/Android/device_info_android.cc

@@ -35,17 +35,6 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo (
     return deviceInfo;
 }
 
-void VideoCaptureImpl::DestroyDeviceInfo(
-    VideoCaptureModule::DeviceInfo* deviceInfo)
-{
-    WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, -1,
-                 "%s", __FUNCTION__);
-
-    videocapturemodule::DeviceInfoAndroid* devInfo =
-        static_cast<videocapturemodule::DeviceInfoAndroid*> (deviceInfo);
-    delete devInfo;
-}
-
 DeviceInfoAndroid::DeviceInfoAndroid(const WebRtc_Word32 id) :
     DeviceInfoImpl(id)
 {

src/modules/video_capture/main/source/Linux/device_info_linux.cc

@@ -43,14 +43,6 @@ VideoCaptureImpl::CreateDeviceInfo(const WebRtc_Word32 id)
     return deviceInfo;
 }
 
-void VideoCaptureImpl::DestroyDeviceInfo(DeviceInfo* deviceInfo)
-{
-    videocapturemodule::DeviceInfoLinux* devInfo =
-        static_cast<videocapturemodule::DeviceInfoLinux*> (deviceInfo);
-    delete devInfo;
-}
-
-
 DeviceInfoLinux::DeviceInfoLinux(const WebRtc_Word32 id)
     : DeviceInfoImpl(id)
 {

src/modules/video_capture/main/source/Windows/device_info_windows.cc

@@ -31,19 +31,12 @@ VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(
 
     if (!dsInfo || dsInfo->Init() != 0)
     {
-        DestroyDeviceInfo(dsInfo);
+        delete dsInfo;
         dsInfo = NULL;
     }
     return dsInfo;
 }
 
-void VideoCaptureImpl::DestroyDeviceInfo(DeviceInfo* deviceInfo)
-{
-    videocapturemodule::DeviceInfoWindows* impl =
-        static_cast<videocapturemodule::DeviceInfoWindows*> (deviceInfo);
-    delete impl;
-}
-
 DeviceInfoWindows::DeviceInfoWindows(const WebRtc_Word32 id)
     : DeviceInfoImpl(id), _dsDevEnum(NULL), _dsMonikerDevEnum(NULL),
       _CoUninitializeIsRequired(true)

src/modules/video_capture/main/source/video_capture_factory.cc

@@ -29,9 +29,4 @@ VideoCaptureModule::DeviceInfo* VideoCaptureFactory::CreateDeviceInfo(
   return videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(id);
 }
 
-void VideoCaptureFactory::DestroyDeviceInfo(
-    VideoCaptureModule::DeviceInfo* deviceInfo) {
-  videocapturemodule::VideoCaptureImpl::DestroyDeviceInfo(deviceInfo);
-}
-
 } // namespace webrtc

src/modules/video_capture/main/source/video_capture_impl.h

@@ -49,7 +49,6 @@ public:
                                       VideoCaptureExternal*& externalCapture);
 
     static DeviceInfo* CreateDeviceInfo(const WebRtc_Word32 id);
-    static void DestroyDeviceInfo(DeviceInfo* deviceInfo);
 
 #ifdef WEBRTC_ANDROID
     static WebRtc_Word32 SetAndroidObjects(void* javaVM, void* javaContext);

src/modules/video_capture/main/test/android/jni/video_capture_module_android_test_jni.cc

@@ -140,7 +140,7 @@ Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StopCapture(
 {
   if (jniData._videoCapture) {
     jniData._videoCapture->StopCapture();
-    VideoCaptureModule::DestroyDeviceInfo(jniData._captureInfo);
+    delete jniData._captureInfo;
     VideoCaptureModule::Destroy(jniData._videoCapture);
     jniData._videoCapture = NULL;
     jniData._captureInfo = NULL;

src/modules/video_capture/main/test/testAPI/testCameraEncoder.cpp

@@ -42,7 +42,7 @@ testCameraEncoder::testCameraEncoder(void)
  
 testCameraEncoder::~testCameraEncoder(void)
 {
-        VideoCaptureModule::DestroyDeviceInfo(_captureInfo);
+    delete _captureInfo;
 
 #ifdef RENDER_PREVIEW
     if(_renderer)

src/modules/video_capture/main/test/testAPI/testPlatformDependent.cpp

@@ -49,7 +49,7 @@ testPlatformDependent::testPlatformDependent(void) :
 
 testPlatformDependent::~testPlatformDependent(void)
 {
-    VideoCaptureModule::DestroyDeviceInfo(_captureInfo);
+    delete _captureInfo;
 
 #ifdef RENDER_PREVIEW
     if (_renderer[0])

src/video_engine/main/source/vie_input_manager.cc

@@ -90,8 +90,7 @@ ViEInputManager::~ViEInputManager()
 #ifndef WEBRTC_VIDEO_EXTERNAL_CAPTURE_AND_RENDER
     if (_ptrCaptureDeviceInfo)
     {
-        VideoCaptureFactory::DestroyDeviceInfo(
+        delete _ptrCaptureDeviceInfo;
-            _ptrCaptureDeviceInfo);
         _ptrCaptureDeviceInfo = NULL;
     }
 #endif

src/video_engine/main/test/AutoTest/source/tb_capture_device.cc

@@ -56,7 +56,7 @@ tbCaptureDevice::tbCaptureDevice(tbInterfaces& Engine, int& nrOfErrors) :
             break;
         }
     }
-    webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
+    delete devInfo;
     numberOfErrors += ViETest::TestError(
         captureDeviceSet, "ERROR: %s at line %d - Could not set capture device",
         __FUNCTION__, __LINE__);

src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc

@@ -116,7 +116,7 @@ int ViEAutoTest::ViEBaseStandardTest()
             vcpm = NULL;
         }
     }
-    webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
+    delete devInfo;
 
     numberOfErrors+= ViETest::TestError(
         captureDeviceSet,

src/video_engine/main/test/AutoTest/source/vie_autotest_capture.cc

@@ -338,7 +338,7 @@ int ViEAutoTest::ViECaptureStandardTest()
         ViETest::Log(" ");
         return numberOfErrors;
     }
-    webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
+    delete devInfo;
 
     ViETest::Log(" ");
     ViETest::Log(" ViECapture Standard Test PASSED!");
@@ -558,7 +558,7 @@ int ViEAutoTest::ViECaptureAPITest()
     numberOfErrors += ViETest::TestError(error == 0, "ERROR: %s at line %d",
                                          __FUNCTION__, __LINE__);
 
-    webrtc::VideoCaptureFactory::DestroyDeviceInfo(devInfo);
+    delete devInfo;
     vcpm->Release();
 
     //***************************************************************

third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc

@@ -241,7 +241,7 @@ scoped_refptr<webrtc::VideoCaptureModule> Conductor::OpenVideoCaptureDevice() {
     if (video_device.get())
       break;
   }
-  webrtc::VideoCaptureFactory::DestroyDeviceInfo(device_info);
+  delete device_info;
   return video_device;
 }