Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / vie_impl.cc

diff --git a/src/third_party/webrtc/video_engine/vie_impl.cc b/src/third_party/webrtc/video_engine/vie_impl.cc
index 3cdf5da..79f033b 100644 (file)
--- a/src/third_party/webrtc/video_engine/vie_impl.cc
+++ b/src/third_party/webrtc/video_engine/vie_impl.cc
@@ -14,11 +14,6 @@
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
-#ifdef WEBRTC_ANDROID
-#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "webrtc/modules/video_render/include/video_render.h"
-#endif
-
 namespace webrtc {
 
 enum { kModuleId = 0 };
@@ -139,20 +134,4 @@ int VideoEngine::SetTraceCallback(TraceCallback* callback) {
   return Trace::SetTraceCallback(callback);
 }
 
-#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
-int VideoEngine::SetAndroidObjects(JavaVM* javaVM, jobject context) {
-  LOG_F(LS_INFO);
-
-  if (SetCaptureAndroidVM(javaVM, context) != 0) {
-    LOG(LS_ERROR) << "Could not set capture Android VM";
-    return -1;
-  }
-  if (SetRenderAndroidVM(javaVM) != 0) {
-    LOG(LS_ERROR) << "Could not set render Android VM";
-    return -1;
-  }
-  return 0;
-}
-#endif
-
 }  // namespace webrtc