Aura on Android: content/browser

content/app/android/library_loader_hooks.cc

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 c26ee0d1298751b911bb463632a0c1598a8f571f..9e5581d9da33328ec8f0c2409243d96055bae916 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -32,7 +32,10 @@
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
+
+#if !defined(USE_AURA)
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
+#endif
 
 namespace content {
 
@@ -55,8 +58,10 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!ui::gl::android::RegisterJni(env))
       return false;
 
+#if !defined(USE_AURA)
     if (!ui::shell_dialogs::RegisterJni(env))
       return false;
+#endif
 
     if (!content::android::RegisterCommonJni(env))
       return false;