| Index: content/app/android/library_loader_hooks.cc
|
| diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
|
| index 9b441d9fe95f3f9dbfb2a7b5f52db1845b77f2f2..7986fb13d2b2e180ad5b919d41922d2629252265 100644
|
| --- a/content/app/android/library_loader_hooks.cc
|
| +++ b/content/app/android/library_loader_hooks.cc
|
| @@ -26,12 +26,12 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/result_codes.h"
|
| #include "device/bluetooth/android/bluetooth_jni_registrar.h"
|
| +#include "device/capture/content/android/screen_capture_jni_registrar.h"
|
| +#include "device/capture/video/android/capture_jni_registrar.h"
|
| #include "device/gamepad/android/gamepad_jni_registrar.h"
|
| #include "device/geolocation/android/geolocation_jni_registrar.h"
|
| #include "device/usb/android/usb_jni_registrar.h"
|
| #include "media/base/android/media_jni_registrar.h"
|
| -#include "media/capture/content/android/screen_capture_jni_registrar.h"
|
| -#include "media/capture/video/android/capture_jni_registrar.h"
|
| #include "media/midi/midi_jni_registrar.h"
|
| #include "net/android/net_jni_registrar.h"
|
| #include "ui/android/ui_android_jni_registrar.h"
|
| @@ -76,27 +76,27 @@ bool EnsureJniRegistered(JNIEnv* env) {
|
| if (!device::android::RegisterBluetoothJni(env))
|
| return false;
|
|
|
| + if (!device::android::RegisterCaptureJni(env))
|
| + return false;
|
| +
|
| if (!device::android::RegisterGamepadJni(env))
|
| return false;
|
|
|
| if (!device::android::RegisterGeolocationJni(env))
|
| return false;
|
|
|
| - if (!device::android::RegisterUsbJni(env))
|
| + if (!device::android::RegisterScreenCaptureJni(env))
|
| return false;
|
|
|
| - if (!media::RegisterJni(env))
|
| + if (!device::android::RegisterUsbJni(env))
|
| return false;
|
|
|
| - if (!media::RegisterCaptureJni(env))
|
| + if (!media::RegisterJni(env))
|
| return false;
|
|
|
| if (!media::midi::RegisterJni(env))
|
| return false;
|
|
|
| - if (!media::RegisterScreenCaptureJni(env))
|
| - return false;
|
| -
|
| if (!ui::RegisterUIAndroidJni(env))
|
| return false;
|
|
|
|
|