Changes to enable pushing large log data to the feedback server as a bz2

BUG=7344
TEST=Manually verified that the bz2 data is getting to the feedback server dev
instance; UI changes will only be active after the next push to prod

Review URL: http://codereview.chromium.org/3814010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63293 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 6 deletions

diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index 8cc10d7..c428924 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -350,15 +350,12 @@ void BugReportUtil::SendReport(Profile* profile,
   // Include the page image if we have one.
   if (zipped_logs_data && CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kCompressSystemFeedback)) {
-/* TODO(zelidrag): http://crosbug.com/7344 - Uncomment this block once proto
-// buffer for ProductSpecificBinaryData gets defined by Feedback team.
     userfeedback::ProductSpecificBinaryData attachment;
     attachment.set_mime_type(kBZip2MimeType);
     attachment.set_name(kLogsAttachmentName);
-    attachment.set_binary_content(std::string(zipped_logs_data,
-                                              zipped_logs_length));
-    *(feedback_data.mutable_productSpecificBinaryData()) = attachment;
-*/
+    attachment.set_data(std::string(zipped_logs_data, zipped_logs_length));
+
+    *(feedback_data.add_product_specific_binary_data()) = attachment;
   }
 #endif
 
diff --git a/chrome/browser/userfeedback/proto/extension.proto b/chrome/browser/userfeedback/proto/extension.proto
index ef4796a..bdfb064 100644
--- a/chrome/browser/userfeedback/proto/extension.proto
+++ b/chrome/browser/userfeedback/proto/extension.proto
@@ -69,6 +69,8 @@ message ExternalExtensionSubmit {
   optional ExtensionErrors extension_errors = 13;
 
   optional ChromeData chrome_data = 14;
+
+  repeated ProductSpecificBinaryData product_specific_binary_data = 15;
 };
 
 // Sent when user hits final submit button in internal extension.
@@ -89,6 +91,8 @@ message InternalExtensionSubmit {
   optional InternalWebData internal_data = 11;
 
   optional ExtensionErrors extension_errors = 12;
+
+  repeated ProductSpecificBinaryData product_specific_binary_data = 15;
 };
 
 // A query for suggestions, sent when the user hits the preview button.
diff --git a/chrome/browser/userfeedback/proto/web.proto b/chrome/browser/userfeedback/proto/web.proto
index 1a4f8bb..cee8aca 100644
--- a/chrome/browser/userfeedback/proto/web.proto
+++ b/chrome/browser/userfeedback/proto/web.proto
@@ -40,6 +40,11 @@ message WebData {
   optional string suggestion_id = 5;
 
   repeated ProductSpecificData product_specific_data = 6;
+
+  // Name of the binary data stored. Replicated from
+  // ProductSpecificBinaryData.name which is stored as a separate
+  // column in Feedbacks3 megastore table.
+  repeated string product_specific_binary_data_name = 7;
 };
 
 message ExtensionDetails {
@@ -69,3 +74,13 @@ message ProductSpecificData {
   required string key = 1;
   optional string value = 2;
 };
+
+message ProductSpecificBinaryData {
+  required string name = 1;
+
+  // mime_type of data
+  optional string mime_type = 2;
+
+  // raw data
+  optional bytes data = 3;
+};