Clean up and modernize the feedback code

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 <memory>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 220 matching lines @@
   SendResponse(true);
 }
 
 bool FeedbackPrivateSendFeedbackFunction::RunAsync() {
   std::unique_ptr<feedback_private::SendFeedback::Params> params(
       feedback_private::SendFeedback::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const FeedbackInfo &feedback_info = params->feedback;
 
-  std::string attached_file_uuid;
-  if (feedback_info.attached_file_blob_uuid &&
-      !feedback_info.attached_file_blob_uuid->empty()) {
-    attached_file_uuid = *feedback_info.attached_file_blob_uuid;
-  }
-
-  std::string screenshot_uuid;
-  if (feedback_info.screenshot_blob_uuid &&
-      !feedback_info.screenshot_blob_uuid->empty()) {
-    screenshot_uuid = *feedback_info.screenshot_blob_uuid;
-  }
-
   // Populate feedback data.
   scoped_refptr<FeedbackData> feedback_data(new FeedbackData());
   feedback_data->set_context(GetProfile());
   feedback_data->set_description(feedback_info.description);
 
   if (feedback_info.product_id)
     feedback_data->set_product_id(*feedback_info.product_id);
   if (feedback_info.category_tag)
     feedback_data->set_category_tag(*feedback_info.category_tag);
   if (feedback_info.page_url)
     feedback_data->set_page_url(*feedback_info.page_url);
   if (feedback_info.email)
     feedback_data->set_user_email(*feedback_info.email);
+  if (feedback_info.trace_id)
+    feedback_data->set_trace_id(*feedback_info.trace_id);
 
-  if (!attached_file_uuid.empty()) {
+  if (feedback_info.attached_file_blob_uuid &&
+      !feedback_info.attached_file_blob_uuid->empty()) {
     feedback_data->set_attached_filename(
         StripFakepath((*feedback_info.attached_file).name));
-    feedback_data->set_attached_file_uuid(attached_file_uuid);
+    feedback_data->set_attached_file_uuid(
+        *feedback_info.attached_file_blob_uuid);
   }
 
-  if (!screenshot_uuid.empty())
-    feedback_data->set_screenshot_uuid(screenshot_uuid);
-
-  if (feedback_info.trace_id) {
-    feedback_data->set_trace_id(*feedback_info.trace_id);
+  if (feedback_info.screenshot_blob_uuid &&
+      !feedback_info.screenshot_blob_uuid->empty()) {
+    feedback_data->set_screenshot_uuid(*feedback_info.screenshot_blob_uuid);
   }
 
   std::unique_ptr<FeedbackData::SystemLogsMap> sys_logs(
       new FeedbackData::SystemLogsMap);
   SystemInformationList* sys_info = feedback_info.system_information.get();
   if (sys_info) {
     for (const SystemInformation& info : *sys_info)
       (*sys_logs)[info.key] = info.value;
   }
   feedback_data->SetAndCompressSystemInfo(std::move(sys_logs));
@@ skipping 46 matching lines @@
       content::RecordAction(
           base::UserMetricsAction("Feedback.SrtPromptClosed"));
       break;
     default:
       return RespondNow(Error("Invalid arugment."));
   }
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions