Thread-local trace-event buffers

content/browser/browser_shutdown_profile_dumper.cc

Index: content/browser/browser_shutdown_profile_dumper.cc
diff --git a/content/browser/browser_shutdown_profile_dumper.cc b/content/browser/browser_shutdown_profile_dumper.cc
index 228e323ee7da0bcd3459cc01d35bb53872305562..fcf2299507f7c90045dd5af83682cfbf7ea62fd6 100644
--- a/content/browser/browser_shutdown_profile_dumper.cc
+++ b/content/browser/browser_shutdown_profile_dumper.cc
@@ -46,10 +46,6 @@ void BrowserShutdownProfileDumper::WriteTracesToDisc(
   base::debug::TraceLog::GetInstance()->Flush(
       base::Bind(&BrowserShutdownProfileDumper::WriteTraceDataCollected,
       base::Unretained(this)));
-
-  WriteString("]");
-  WriteString("}");
-  CloseFile();
 }
 
 base::FilePath BrowserShutdownProfileDumper::GetFileName() {
@@ -65,7 +61,8 @@ base::FilePath BrowserShutdownProfileDumper::GetFileName() {
 }
 
 void BrowserShutdownProfileDumper::WriteTraceDataCollected(
-    const scoped_refptr<base::RefCountedString>& events_str) {
+    const scoped_refptr<base::RefCountedString>& events_str,
+    bool has_more_events) {
   if (!IsFileValid())
     return;
   if (blocks_) {
@@ -75,6 +72,12 @@ void BrowserShutdownProfileDumper::WriteTraceDataCollected(
   }
   ++blocks_;
   WriteString(events_str->data());
+
+  if (!has_more_events) {
+    WriteString("]");
+    WriteString("}");
+    CloseFile();
+  }
 }
 
 bool BrowserShutdownProfileDumper::IsFileValid() {