Android: Allow compiling browser without Java UI

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index cb27994b8fdcd829186db4620c494a8624350bfc..dac1cb2f33206defdb90b641449d4e18ae46b4ef 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -88,8 +88,11 @@
 #include "chromeos/chromeos_switches.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/android/java_exception_reporter.h"
+#endif
+
+#if defined(OS_ANDROID)
 #include "chrome/common/descriptors_android.h"
 #else
 // Diagnostics is only available on non-android platforms.
@@ -792,7 +795,9 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_ANDROID)
     if (process_type.empty()) {
       breakpad::InitCrashReporter(process_type);
+#if defined(ANDROID_JAVA_UI)

[Ted C, 2015/11/30 19:39:04]

You always want this.

[no sievers, 2015/11/30 23:56:34]

Yes, but it wouldn't work as is because I'm removing all Java code from the
build in this patch.

I put a TODO with bug number. This is definitely one of the straightforward ones
to do, but I want to gradually pull the Java code back into the build. And
ideally while we do it, we'd also organize the code with deps rules or
something, so that for example nobody can go in and make the exception reporter
depend on Tab.java or something.

       chrome::android::InitJavaExceptionReporter();
+#endif
     } else {
       breakpad::InitNonBrowserCrashReporterForAndroid(process_type);
     }