Sent feedback reports must respect the product ID if any was provided

components/feedback/feedback_common.cc

 // Copyright 2014 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 "components/feedback/feedback_common.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "components/feedback/proto/common.pb.h"
 #include "components/feedback/proto/dom.pb.h"
 #include "components/feedback/proto/extension.pb.h"
 #include "components/feedback/proto/math.pb.h"
 
 namespace {
 
+#if defined(OS_CHROMEOS)
+constexpr int kChromeOSProductId = 208;
+#else
+constexpr int kChromeBrowserProductId = 237;
+#endif
+
 const char kMultilineIndicatorString[] = "<multiline>\n";
 const char kMultilineStartString[] = "---------- START ----------\n";
 const char kMultilineEndString[] = "---------- END ----------\n\n";
 
 const size_t kFeedbackMaxLength = 4 * 1024;
 const size_t kFeedbackMaxLineCount = 40;
 
 const base::FilePath::CharType kLogsFilename[] =
     FILE_PATH_LITERAL("system_logs.txt");
 const char kLogsAttachmentName[] = "system_logs.zip";
@@ skipping 64 matching lines @@
 }
 
 }  // namespace
 
 FeedbackCommon::AttachedFile::AttachedFile(const std::string& filename,
                                            std::unique_ptr<std::string> data)
     : name(filename), data(std::move(data)) {}
 
 FeedbackCommon::AttachedFile::~AttachedFile() {}
 
-
-FeedbackCommon::FeedbackCommon() : product_id_(0) {}
+FeedbackCommon::FeedbackCommon() : product_id_(-1) {}
 
 FeedbackCommon::~FeedbackCommon() {}
 
 // static
 bool FeedbackCommon::BelowCompressionThreshold(const std::string& content) {
   if (content.length() > kFeedbackMaxLength)
     return false;
   const size_t line_count = std::count(content.begin(), content.end(), '\n');
   if (line_count > kFeedbackMaxLineCount)
     return false;
@@ skipping 61 matching lines @@
   for (size_t i = 0; i < attachments(); i++) {
     const AttachedFile* file = attachment(i);
     AddAttachment(feedback_data, file->name.c_str(), *file->data.get());
   }
 }
 
 void FeedbackCommon::PrepareReport(
     userfeedback::ExtensionSubmit* feedback_data) const {
   // Unused field, needs to be 0 though.
   feedback_data->set_type_id(0);
-  feedback_data->set_product_id(product_id_);
+
+  // Set whether we're reporting from ChromeOS or Chrome on another platform.
+  userfeedback::ChromeData chrome_data;
+#if defined(OS_CHROMEOS)
+  const userfeedback::ChromeData_ChromePlatform chrome_platform =
+      userfeedback::ChromeData_ChromePlatform_CHROME_OS;
+  const int default_product_id = kChromeOSProductId;
+  userfeedback::ChromeOsData chrome_os_data;
+  chrome_os_data.set_category(
+      userfeedback::ChromeOsData_ChromeOsCategory_OTHER);
+  *(chrome_data.mutable_chrome_os_data()) = chrome_os_data;
+#else
+  const userfeedback::ChromeData_ChromePlatform chrome_platform =
+      userfeedback::ChromeData_ChromePlatform_CHROME_BROWSER;
+  const int default_product_id = kChromeBrowserProductId;
+  userfeedback::ChromeBrowserData chrome_browser_data;
+  chrome_browser_data.set_category(
+      userfeedback::ChromeBrowserData_ChromeBrowserCategory_OTHER);
+  *(chrome_data.mutable_chrome_browser_data()) = chrome_browser_data;
+#endif  // defined(OS_CHROMEOS)
+  chrome_data.set_chrome_platform(chrome_platform);
+  *(feedback_data->mutable_chrome_data()) = chrome_data;
+
+  feedback_data->set_product_id(HasProductId() ? product_id_
+                                               : default_product_id);
 
   userfeedback::CommonData* common_data = feedback_data->mutable_common_data();
   // We're not using gaia ids, we're using the e-mail field instead.
   common_data->set_gaia_id(0);
   common_data->set_user_email(user_email());
   common_data->set_description(description());
   common_data->set_source_description_language(locale());
 
   userfeedback::WebData* web_data = feedback_data->mutable_web_data();
   web_data->set_url(page_url());
@@ skipping 13 matching lines @@
 
     *(screenshot.mutable_dimensions()) = dimensions;
     screenshot.set_binary_content(*image());
 
     *(feedback_data->mutable_screenshot()) = screenshot;
   }
 
   if (category_tag().size())
     feedback_data->set_bucket(category_tag());
 }