implement SetWatchEvent and WaitForEvent for trace-based-tests

base/test/trace_event_analyzer_unittest.cc

Index: base/test/trace_event_analyzer_unittest.cc
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index 63760a4fada50ff31049ae4a8a9e8d6ded5bc794..5d850e22ee30203164db5df6e90a071ddf2f8ac6 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -26,11 +26,7 @@ class TraceEventAnalyzerTest : public testing::Test {
 
 void TraceEventAnalyzerTest::ManualSetUp() {
   base::debug::TraceLog::Resurrect();
-  base::debug::TraceLog* tracelog = base::debug::TraceLog::GetInstance();
-  ASSERT_TRUE(tracelog);
-  tracelog->SetOutputCallback(
-    base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected,
-               base::Unretained(this)));
+  ASSERT_TRUE(base::debug::TraceLog::GetInstance());
   buffer_.SetOutputCallback(output_.GetCallback());
   output_.json_output.clear();
 }
@@ -48,6 +44,9 @@ void TraceEventAnalyzerTest::BeginTracing() {
 
 void TraceEventAnalyzerTest::EndTracing() {
   base::debug::TraceLog::GetInstance()->SetEnabled(false);
+  base::debug::TraceLog::GetInstance()->Flush(
+      base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected,
+                 base::Unretained(this)));
   buffer_.Finish();
 }