Android: Allow compiling browser without Java UI

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 70 matching lines @@
 #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
+#if defined(ANDROID_JAVA_UI)
+#include "chrome/browser/android/java_exception_reporter.h"
+#endif
+
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/java_exception_reporter.h"
 #include "chrome/common/descriptors_android.h"
 #else
 // Diagnostics is only available on non-android platforms.
 #include "chrome/browser/diagnostics/diagnostics_controller.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 #endif
 
 #if defined(USE_X11)
 #include <stdlib.h>
 #include <string.h>
@@ skipping 682 matching lines @@
 
   chrome::InitializePDF();
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
 #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);
     }
 #else  // !defined(OS_ANDROID)
     breakpad::InitCrashReporter(process_type);
 #endif  // defined(OS_ANDROID)
   }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
   // After all the platform Breakpads have been initialized, store the command
@@ skipping 174 matching lines @@
     case version_info::Channel::CANARY:
       return true;
     case version_info::Channel::DEV:
     case version_info::Channel::BETA:
     case version_info::Channel::STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }