Send compressed histograms with system logs when sending feedback.

chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

 // Copyright 2013 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/extensions/api/feedback_private/feedback_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 89 matching lines @@
 bool FeedbackPrivateGetStringsFunction::RunImpl() {
   DictionaryValue* dict = new DictionaryValue();
   SetResult(dict);
 
 #define SET_STRING(id, idr) \
   dict->SetString(id, l10n_util::GetStringUTF16(idr))
   SET_STRING("page-title", IDS_FEEDBACK_REPORT_PAGE_TITLE);
   SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL);
   SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);
   SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);
-  SET_STRING("sysinfo", IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_CHKBOX);
+  SET_STRING("sys-info",
+             IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX);
   SET_STRING("attach-file-label", IDS_FEEDBACK_ATTACH_FILE_LABEL);
   SET_STRING("attach-file-note", IDS_FEEDBACK_ATTACH_FILE_NOTE);
   SET_STRING("attach-file-to-big", IDS_FEEDBACK_ATTACH_FILE_TO_BIG);
   SET_STRING("reading-file", IDS_FEEDBACK_READING_FILE);
   SET_STRING("send-report", IDS_FEEDBACK_SEND_REPORT);
   SET_STRING("cancel", IDS_CANCEL);
   SET_STRING("no-description", IDS_FEEDBACK_NO_DESCRIPTION);
   SET_STRING("privacy-note", IDS_FEEDBACK_PRIVACY_NOTE);
   SET_STRING("performance-trace",
              IDS_FEEDBACK_INCLUDE_PERFORMANCE_TRACE_CHECKBOX);
@@ skipping 87 matching lines @@
     for (SystemInformationList::iterator it = sys_info->begin();
          it != sys_info->end(); ++it)
       (*sys_logs.get())[it->get()->key] = it->get()->value;
   }
   feedback_data->SetAndCompressSystemInfo(sys_logs.Pass());
 
   FeedbackService* service = FeedbackPrivateAPI::GetFactoryInstance()
                                  ->GetForProfile(GetProfile())
                                  ->GetService();
   DCHECK(service);
+
+  if (feedback_info.send_histograms) {

[rkc, 2013/11/01 19:57:39]

As mentioned in the IDL, this could just be a check the canary key in system
info.

+    scoped_ptr<std::string> histograms(service->GetHistograms());
+    feedback_data->SetAndCompressHistograms(*histograms);
+  }
+
   service->SendFeedback(
       GetProfile(),
       feedback_data,
       base::Bind(&FeedbackPrivateSendFeedbackFunction::OnCompleted, this));
+
   return true;
 }
 
 void FeedbackPrivateSendFeedbackFunction::OnCompleted(
     bool success) {
   results_ = feedback_private::SendFeedback::Results::Create(
       success ? feedback_private::STATUS_SUCCESS :
                 feedback_private::STATUS_DELAYED);
   SendResponse(true);
 }
 
 }  // namespace extensions