Properly complete sending feedback reports when a trace is attached

chrome/browser/feedback/feedback_data.cc

Index: chrome/browser/feedback/feedback_data.cc
diff --git a/chrome/browser/feedback/feedback_data.cc b/chrome/browser/feedback/feedback_data.cc
index 95cb49fe9f9108ad113d1c7adf196273ee5e3cbf..9574fb6c27c9b0003ca547d6b08dae0bc158ccdb 100644
--- a/chrome/browser/feedback/feedback_data.cc
+++ b/chrome/browser/feedback/feedback_data.cc
@@ -171,17 +171,19 @@ void FeedbackData::AttachAndCompressFileData(
 }
 
 void FeedbackData::OnGetTraceData(
-    int trace_id_,
+    int trace_id,
     scoped_refptr<base::RefCountedString> trace_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   TracingManager* manager = TracingManager::Get();
   if (manager)
-    manager->DiscardTraceData(trace_id_);
+    manager->DiscardTraceData(trace_id);
 
-  scoped_ptr<std::string> data(new std::string(trace_data->data()));
+  scoped_ptr<std::string> data(new std::string);
+  data->swap(trace_data->data());
 
   attached_filename_ = kTraceFilename;
   attached_filedata_ = data.Pass();
+  attached_file_compression_complete_ = true;
   trace_id_ = 0;
 
   set_category_tag(kPerformanceCategoryTag);