Properly complete sending feedback reports when a trace is attached

chrome/browser/feedback/feedback_data.cc

 // 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.
 
 #include "chrome/browser/feedback/feedback_data.h"
 
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 153 matching lines @@
                    attached_file,
                    *(attached_filedata_.get()),
                    compressed_file_ptr),
         base::Bind(&FeedbackData::OnCompressFileComplete,
                    this,
                    base::Passed(&compressed_file)));
   }
 }
 
 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);
 
   SendReport();
 }
 
 void FeedbackData::OnCompressLogsComplete(
     scoped_ptr<std::string> compressed_logs) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 27 matching lines @@
       feedback_page_data_complete_;
 }
 
 void FeedbackData::SendReport() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (IsDataComplete() && !report_sent_) {
     report_sent_ = true;
     feedback_util::SendReport(this);
   }
 }