1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/third_party/webrtc/modules/video_capture/include/video_capture.h b/chromium/third_party/webrtc/modules/video_capture/include/video_capture.h
index 6b6247c2777..7398af60448 100644
--- a/chromium/third_party/webrtc/modules/video_capture/include/video_capture.h
+++ b/chromium/third_party/webrtc/modules/video_capture/include/video_capture.h
@@ -20,8 +20,8 @@
 
 namespace webrtc {
 
-#if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
-int32_t SetCaptureAndroidVM(JavaVM* javaVM);
+#if defined(ANDROID)
+int32_t SetCaptureAndroidVM(JavaVM* javaVM, jobject context);
 #endif
 
 class VideoCaptureModule: public RefCountedModule {
@@ -105,18 +105,17 @@ class VideoCaptureModule: public RefCountedModule {
   };
 
   //   Register capture data callback
-  virtual int32_t RegisterCaptureDataCallback(
+  virtual void RegisterCaptureDataCallback(
       VideoCaptureDataCallback& dataCallback) = 0;
 
   //  Remove capture data callback
-  virtual int32_t DeRegisterCaptureDataCallback() = 0;
+  virtual void DeRegisterCaptureDataCallback() = 0;
 
   // Register capture callback.
-  virtual int32_t RegisterCaptureCallback(
-      VideoCaptureFeedBack& callBack) = 0;
+  virtual void RegisterCaptureCallback(VideoCaptureFeedBack& callBack) = 0;
 
   //  Remove capture callback.
-  virtual int32_t DeRegisterCaptureCallback() = 0;
+  virtual void DeRegisterCaptureCallback() = 0;
 
   // Start capture device
   virtual int32_t StartCapture(
@@ -133,7 +132,7 @@ class VideoCaptureModule: public RefCountedModule {
   // Gets the current configuration.
   virtual int32_t CaptureSettings(VideoCaptureCapability& settings) = 0;
 
-  virtual int32_t SetCaptureDelay(int32_t delayMS) = 0;
+  virtual void SetCaptureDelay(int32_t delayMS) = 0;
 
   // Returns the current CaptureDelay. Only valid when the camera is running.
   virtual int32_t CaptureDelay() = 0;
@@ -149,8 +148,8 @@ class VideoCaptureModule: public RefCountedModule {
   virtual VideoCaptureEncodeInterface* GetEncodeInterface(
       const VideoCodec& codec) = 0;
 
-  virtual int32_t EnableFrameRateCallback(const bool enable) = 0;
-  virtual int32_t EnableNoPictureAlarm(const bool enable) = 0;
+  virtual void EnableFrameRateCallback(const bool enable) = 0;
+  virtual void EnableNoPictureAlarm(const bool enable) = 0;
 
 protected:
   virtual ~VideoCaptureModule() {};