Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: content/public/test/content_test_suite_base.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/BUILD.gn ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_test_suite_base.cc
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 69cf50ce9474dd03b58e66e1eb8d107d0bcd57f9..ee26358ce19bfb437e9c3d3380f56fc5e70e833b 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -33,9 +33,9 @@
#include "base/android/jni_android.h"
#include "content/browser/android/browser_jni_registrar.h"
#include "content/common/android/common_jni_registrar.h"
+#include "device/capture/video/android/capture_jni_registrar.h"
#include "device/geolocation/android/geolocation_jni_registrar.h"
#include "media/base/android/media_jni_registrar.h"
-#include "media/capture/video/android/capture_jni_registrar.h"
#include "net/android/net_jni_registrar.h"
#include "ui/android/ui_android_jni_registrar.h"
#include "ui/base/android/ui_base_jni_registrar.h"
@@ -88,9 +88,9 @@ void ContentTestSuiteBase::Initialize() {
JNIEnv* env = base::android::AttachCurrentThread();
content::android::RegisterCommonJni(env);
content::android::RegisterBrowserJni(env);
+ device::android::RegisterCaptureJni(env);
device::android::RegisterGeolocationJni(env);
gfx::android::RegisterJni(env);
- media::RegisterCaptureJni(env);
media::RegisterJni(env);
net::android::RegisterJni(env);
ui::android::RegisterJni(env);
« no previous file with comments | « content/public/android/BUILD.gn ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698