Send compressed histograms with system logs when sending feedback.

chrome/browser/feedback/feedback_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
 #define CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 
   FeedbackData();
 
   // Called once we've updated all the data from the feedback page.
   void OnFeedbackPageDataComplete();
 
   // Sets the system information for this instance and kicks off its
   // 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);
 
   // Returns true if we've completed all the tasks needed before we can send
   // feedback - at this time this is includes getting the feedback page data
   // and compressing the system logs.
   bool IsDataComplete();
 
   // Sends the feedback report if we have all our data complete.
   void SendReport();
 
   // Getters
   Profile* profile() const { return profile_; }
   const std::string& category_tag() const { return category_tag_; }
   const std::string& page_url() const { return page_url_; }
   const std::string& description() const { return description_; }
   const std::string& user_email() const { return user_email_; }
   std::string* image() const { return image_.get(); }
   const std::string attached_filename() const { return attached_filename_; }
   const std::string attached_file_uuid() const { return attached_file_uuid_; }
   std::string* attached_filedata() const { return attached_filedata_.get(); }
   const std::string screenshot_uuid() const { return screenshot_uuid_; }
   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; }
   void set_category_tag(const std::string& category_tag) {
     category_tag_ = category_tag;
   }
   void set_page_url(const std::string& page_url) { page_url_ = page_url; }
   void set_description(const std::string& description) {
     description_ = description;
   }
@@ skipping 31 matching lines @@
   scoped_ptr<std::string> attached_filedata_;
 
   std::string attached_file_uuid_;
   std::string screenshot_uuid_;
 
   int trace_id_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackData);
 };
 
 #endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_