Remove android_java_ui as it is not used

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 <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 83 matching lines @@
 #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"
 #include "chromeos/hugepage_text/hugepage_text.h"
 #endif
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)

[Ted C, 2017/01/06 22:00:21]

combine with below

[F, 2017/01/09 21:36:32]

Done.

 #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.
 #include "chrome/browser/diagnostics/diagnostics_controller.h"
 #include "chrome/browser/diagnostics/diagnostics_writer.h"
 #endif
@@ skipping 767 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);
-// TODO(crbug.com/551176): Exception reporting should work without
-// ANDROID_JAVA_UI
-#if BUILDFLAG(ANDROID_JAVA_UI)
+// TODO(crbug.com/551176): Exception reporting should work without OS_ANDROID.

[Ted C, 2017/01/06 22:00:21]

Remove as this is no longer valid

[F, 2017/01/09 21:36:32]

Done.

+#if defined(OS_ANDROID)
       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)
@@ skipping 180 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;
   }
 }