Make profile error dialog checkbox opt-in and improve feedback description

chrome/browser/ui/profile_error_dialog.cc

Index: chrome/browser/ui/profile_error_dialog.cc
diff --git a/chrome/browser/ui/profile_error_dialog.cc b/chrome/browser/ui/profile_error_dialog.cc
index be87874256b5b62c9c85461aa3eefa58cd1d4b4d..93b5c947b5343e3b9277d784f49fd2687ac1d095 100644
--- a/chrome/browser/ui/profile_error_dialog.cc
+++ b/chrome/browser/ui/profile_error_dialog.cc
@@ -46,7 +46,14 @@ void ShowProfileErrorDialog(ProfileErrorType type,
           l10n_util::GetStringUTF16(IDS_PROFILE_ERROR_DIALOG_CHECKBOX))) {
     std::string feedback_description =
         l10n_util::GetStringUTF8(IDS_PROFILE_ERROR_FEEDBACK_DESCRIPTION);
-    feedback_description += "\n" + diagnostics;
+    if (!diagnostics.empty()) {
+      // TODO(afakhry): Add support to inject diagnostics to the feedback
+      // reports without adding them to the description. crbug.com/708511.
+      feedback_description += "\n\n" +
+                              l10n_util::GetStringUTF8(
+                                  IDS_PROFILE_ERROR_FEEDBACK_DIAGNOSTICS_LINE) +
+                              diagnostics;
+    }
 
     chrome::ShowFeedbackPage(nullptr, chrome::kFeedbackSourceProfileErrorDialog,
                              feedback_description,