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

chrome/browser/ui/profile_error_dialog.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/browser/ui/profile_error_dialog.h"
 
 #include "base/auto_reset.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 28 matching lines @@
   if (is_showing_profile_error_dialog)
     return;
 
   base::AutoReset<bool> resetter(&is_showing_profile_error_dialog, true);
   if (chrome::ShowWarningMessageBoxWithCheckbox(
           nullptr, l10n_util::GetStringUTF16(IDS_PROFILE_ERROR_DIALOG_TITLE),
           l10n_util::GetStringUTF16(message_id),
           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,
                              kProfileErrorFeedbackCategory);
   }
 #endif
 }