[Android] Wire up manual crash uploads.

chrome/browser/ui/webui/crashes_ui.cc

Index: chrome/browser/ui/webui/crashes_ui.cc
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 93cd252213010e70553cfbf53e27008e4584a014..654af34a53ba129d504090470afd2f65923deb8b 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -93,10 +93,8 @@ class CrashesDOMHandler : public WebUIMessageHandler,
   // Sends the recent crashes list JS.
   void UpdateUI();
 
-#if defined(OS_WIN) || defined(OS_MACOSX)

[Mark Mentovai, 2016/09/15 00:02:30]

Is it helpful to get rid of these rather than add OS_ANDROID? It’s dead weight
on, say, Chrome OS.

[Ilya Sherman, 2016/09/21 22:50:03]

I'm kind of assuming the compiler can strip dead code well enough to where we
don't need this sort of micro-optimization.  Am I wrong?  It was a bit tedious
to find all of the spots that needed updating, and it seemed preferable to me to
have only a single preprocessor block that needed to updated.  But, if it's
important to reduce dead weight on other platforms, I can restore all of these
checks.

   // Asynchronously requests a user triggered upload. Called from JS.
   void HandleRequestSingleCrashUpload(const base::ListValue* args);
-#endif
 
   scoped_refptr<CrashUploadList> upload_list_;
   bool list_available_;
@@ -128,12 +126,10 @@ void CrashesDOMHandler::RegisterMessages() {
                  base::Unretained(this)));
 #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
   web_ui()->RegisterMessageCallback(
       crash::kCrashesUIRequestSingleCrashUpload,
       base::Bind(&CrashesDOMHandler::HandleRequestSingleCrashUpload,
                  base::Unretained(this)));
-#endif
 }
 
 void CrashesDOMHandler::HandleRequestCrashes(const base::ListValue* args) {
@@ -176,9 +172,9 @@ void CrashesDOMHandler::UpdateUI() {
   bool upload_list = crash_reporting_enabled;
   bool support_manual_uploads = false;
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  // Maunal uploads currently are supported only for Crashpad-using platforms
-  // and only if crash uploads are not disabled by policy.
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
+  // Maunal uploads currently are supported only for Crashpad-using platforms or

[Mark Mentovai, 2016/09/15 00:02:30]

and

[Ilya Sherman, 2016/09/21 22:50:03]

Done.

+  // Android, and only if crash uploads are not disabled by policy.
   support_manual_uploads =
       crash_reporting_enabled || !IsMetricsReportingPolicyManaged();
 
@@ -209,7 +205,6 @@ void CrashesDOMHandler::UpdateUI() {
                                          args);
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
 void CrashesDOMHandler::HandleRequestSingleCrashUpload(
     const base::ListValue* args) {
   DCHECK(args);
@@ -225,7 +220,6 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
   }
   upload_list_->RequestSingleCrashUploadAsync(local_id);
 }
-#endif
 
 }  // namespace