Send compressed histograms with system logs when sending feedback.

chrome/browser/feedback/feedback_data.h

Index: chrome/browser/feedback/feedback_data.h
diff --git a/chrome/browser/feedback/feedback_data.h b/chrome/browser/feedback/feedback_data.h
index 49a66430d64c2dd7b7554e018801810944c59642..9ffe552da7e88afd71699f8f0d7eb5afaf86e5dc 100644
--- a/chrome/browser/feedback/feedback_data.h
+++ b/chrome/browser/feedback/feedback_data.h
@@ -36,13 +36,20 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   // compression.
   void SetAndCompressSystemInfo(scoped_ptr<SystemLogsMap> sys_info);
 
-  // Sets the system information for this instance and kicks off its
+  // Sets the histograms for this instance and kicks off its
   // compression.
+  void SetAndCompressHistograms(const std::string& histograms);

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

This should be a scoper for the same reasons why we use a scoper for
AttachAndCompressFileData. The data can potentially be very large, you don't
want to be copying that large a string if it can be avoided. Considering
GetHistograms returns a scoper, it should be trivial to change this to be a
scoper too.

[michaelpg, 2013/11/01 22:14:50]

Done. Not sure why a scoped_ptr is preferred to a reference though.

[rkc, 2013/11/01 22:28:32]

The reference is not copied only during invocation of the method; the histogram_
= histogram statement in the implementation will still do a copy of the full
string.

+
+  // Sets the attached file data and kicks off its compression.
   void AttachAndCompressFileData(scoped_ptr<std::string> attached_filedata);
 
   // Called once we have compressed our system logs.
   void OnCompressLogsComplete(scoped_ptr<std::string> compressed_logs);
 
+  // Called once we have compressed our histograms.
+  void OnCompressHistogramsComplete(
+      scoped_ptr<std::string> compressed_histograms);
+
   // Called once we have compressed our attached file.
   void OnCompressFileComplete(scoped_ptr<std::string> compressed_file);
 
@@ -68,6 +75,10 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   int trace_id() const { return trace_id_; }
   SystemLogsMap* sys_info() const { return sys_info_.get(); }
   std::string* compressed_logs() const { return compressed_logs_.get(); }
+  const std::string& histograms() const { return histograms_; }
+  std::string* compressed_histograms() const {
+    return compressed_histograms_.get();
+  }
 
   // Setters
   void set_profile(Profile* profile) { profile_ = profile; }
@@ -119,8 +130,12 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   scoped_ptr<SystemLogsMap> sys_info_;
   scoped_ptr<std::string> compressed_logs_;
 
+  std::string histograms_;
+  scoped_ptr<std::string> compressed_histograms_;
+
   bool feedback_page_data_complete_;
   bool syslogs_compression_complete_;
+  bool histograms_compression_complete_;

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

Put a TODO over this block of booleans indicating that this needs to be
refactored to be a cleaner solution. Feel free to TODO(rkc) it.

[michaelpg, 2013/11/01 22:14:50]

Done.

   bool attached_file_compression_complete_;
   bool report_sent_;