roll webrtc to r614

corresponding change in gyp file remove obsolete functions in webrtc::VideoCaptureModule Review URL: http://codereview.chromium.org/7918032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101832 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Sep 19, 2011 · 0738210 · 0738210
1 parent 8408bcf
commit 0738210
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/DEPS b/DEPS
@@ -31,7 +31,7 @@ vars = {
   "sfntly_revision": "54",
   "skia_revision": "2280",
   "v8_revision": "9288",
-  "webrtc_revision": "565",
+  "webrtc_revision": "614",
 
   # Note: On most bots, clang is not checked out via DEPS but by
   # tools/clang/scripts/update.sh. The script reads this line here.

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
@@ -236,10 +236,10 @@
         }],
         ['enable_webrtc==1', {
           'dependencies': [
-            '../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
+            '../third_party/webrtc/modules/modules.gyp:video_capture_module',
             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
-            '../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+            '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
+            '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
           ],
           'sources': [
             'renderer/media/video_capture_module_impl.cc',

diff --git a/content/renderer/media/video_capture_module_impl.cc b/content/renderer/media/video_capture_module_impl.cc
@@ -6,13 +6,6 @@
 
 #include "content/renderer/media/video_capture_impl_manager.h"
 
-// static
-webrtc::VideoCaptureModule* webrtc::VideoCaptureModule::Create(
-    const WebRtc_Word32 id, const WebRtc_UWord8* device_unique_id_utf8) {
-  NOTREACHED();
-  return NULL;
-}
-
 VideoCaptureModuleImpl::VideoCaptureModuleImpl(
     const media::VideoCaptureSessionId id,
     VideoCaptureImplManager* vc_manager)

diff --git a/content/renderer/media/video_capture_module_impl_device_info.cc b/content/renderer/media/video_capture_module_impl_device_info.cc
@@ -8,20 +8,6 @@
 
 static const char* kLocalDeviceName = "chromecamera";
 
-// static
-webrtc::VideoCaptureModule::DeviceInfo*
-webrtc::VideoCaptureModule::CreateDeviceInfo(const WebRtc_Word32 id) {
-  return new VideoCaptureModuleImplDeviceInfo(id);
-}
-
-// static
-void webrtc::VideoCaptureModule::DestroyDeviceInfo(
-    webrtc::VideoCaptureModule::DeviceInfo* device_info) {
-  VideoCaptureModuleImplDeviceInfo* dev_info =
-      static_cast<VideoCaptureModuleImplDeviceInfo*>(device_info);
-  delete dev_info;
-}
-
 VideoCaptureModuleImplDeviceInfo::VideoCaptureModuleImplDeviceInfo(
     const WebRtc_Word32 id) {
 }