Show not uploaded crashes for Android.

chrome/browser/crash_upload_list/crash_upload_list.cc

Index: chrome/browser/crash_upload_list/crash_upload_list.cc
diff --git a/chrome/browser/crash_upload_list/crash_upload_list.cc b/chrome/browser/crash_upload_list/crash_upload_list.cc
index 38066399dd97214f2733abfe1c8d9393b1c211dc..c8cb00b03c57b5e6b293d7ddf6496200b43f7a9f 100644
--- a/chrome/browser/crash_upload_list/crash_upload_list.cc
+++ b/chrome/browser/crash_upload_list/crash_upload_list.cc
@@ -9,12 +9,17 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/features.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
 #include "chrome/browser/crash_upload_list/crash_upload_list_crashpad.h"
 #endif
 
+#if BUILDFLAG(ANDROID_JAVA_UI)

[Ilya Sherman, 2016/09/01 20:49:31]

Hmm, is an OS check not more appropriate?  I'm not sure when one would choose
OS_ANDROID vs. ANDROID_JAVA_UI.

[gayane -on leave until 09-2017, 2016/09/01 22:17:58]

It's not exactly clear for me, but I have seen more of a ANDROID_JAVA_UI in
recent changes and my understanding is that OS_ANDROID is wider and can include
not mobile related code.

[Ilya Sherman, 2016/09/01 22:43:04]

Okay.  I think we should check with someone who's more familiar with the Android
build system, as it's still not quite clear to me when it's appropriate to use
one flag vs. the other.

+#include "chrome/browser/crash_upload_list/crash_upload_list_android.h"
+#endif
+
 scoped_refptr<CrashUploadList> CreateCrashUploadList(
     UploadList::Delegate* delegate) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
@@ -25,7 +30,12 @@ scoped_refptr<CrashUploadList> CreateCrashUploadList(
   PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
   base::FilePath upload_log_path =
       crash_dir_path.AppendASCII(CrashUploadList::kReporterLogFilename);
+#if BUILDFLAG(ANDROID_JAVA_UI)
+  return new CrashUploadListAndroid(delegate, upload_log_path,
+                                    content::BrowserThread::GetBlockingPool());
+#else
   return new CrashUploadList(delegate, upload_log_path,
                              content::BrowserThread::GetBlockingPool());
-#endif
+#endif  // BUILDFLAG(ANDROID_JAVA_UI)
+#endif  // defined(OS_MACOSX) || defined(OS_WIN)
 }