Backed out changeset 8328bc2054d1 (bug 1058944)

media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc

@@ -351,7 +351,7 @@ VideoCaptureModule::DeviceInfo* DesktopCaptureImpl::CreateDeviceInfo(const int32
 }
 
 const char* DesktopCaptureImpl::CurrentDeviceName() const {
-  return _deviceUniqueId.c_str();
+  return _deviceUniqueId;
 }
 
 int32_t DesktopCaptureImpl::ChangeUniqueId(const int32_t id) {
@@ -400,8 +400,6 @@ int32_t DesktopCaptureImpl::Init(const char* uniqueId,
     MouseCursorMonitor *pMouseCursorMonitor = MouseCursorMonitor::CreateForWindow(webrtc::DesktopCaptureOptions::CreateDefault(), winId);
     desktop_capturer_cursor_composer_.reset(new DesktopAndCursorComposer(pWindowCapturer, pMouseCursorMonitor));
   }
-  _deviceUniqueId = uniqueId;
-
   return 0;
 }
 
@@ -455,7 +453,7 @@ int32_t DesktopCaptureImpl::Process() {
 
 DesktopCaptureImpl::DesktopCaptureImpl(const int32_t id)
   : _id(id),
-    _deviceUniqueId(""),
+    _deviceUniqueId(NULL),
     _apiCs(*CriticalSectionWrapper::CreateCriticalSection()),
     _captureDelay(0),
     _requestedCapability(),
@@ -491,6 +489,8 @@ DesktopCaptureImpl::~DesktopCaptureImpl() {
   DeRegisterCaptureCallback();
   delete &_callBackCs;
   delete &_apiCs;
+
+  delete[] _deviceUniqueId;
 }
 
 void DesktopCaptureImpl::RegisterCaptureDataCallback(

media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.h

@@ -15,8 +15,6 @@
  * video_capture_impl.h
  */
 
-#include <string>
-
 #include "webrtc/common_video/interface/i420_video_frame.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/desktop_capture/screen_capturer.h"
@@ -220,7 +218,7 @@ protected:
                                int64_t capture_time);
 
   int32_t _id; // Module ID
-  std::string _deviceUniqueId; // current Device unique name;
+  char* _deviceUniqueId; // current Device unique name;
   CriticalSectionWrapper& _apiCs;
   int32_t _captureDelay; // Current capture delay. May be changed of platform dependent parts.
   VideoCaptureCapability _requestedCapability; // Should be set by platform dependent code in StartCapture.