From 05fabff29b081367bce98ce69e86dbf41de024f8 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 4 Feb 2019 16:36:13 -0500
Subject: [PATCH] Fix TracingTest failures (issue #2583)

---
 tests/ceftests/tracing_unittest.cc | 53 +++++++++++++++++-------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/tests/ceftests/tracing_unittest.cc b/tests/ceftests/tracing_unittest.cc
index be23a8866..d89625494 100644
--- a/tests/ceftests/tracing_unittest.cc
+++ b/tests/ceftests/tracing_unittest.cc
@@ -78,24 +78,20 @@ class TracingTestHandler : public CefEndTracingCallback,
     completion_event_ = CefWaitableEvent::CreateWaitableEvent(true, false);
   }
 
-  void ReadTracingFile(const std::string& file_path) {
-    EXPECT_FILE_THREAD();
+  void ExecuteTest() {
+    // Run the test.
+    CefPostTask(TID_UI, base::Bind(&TracingTestHandler::BeginTracing, this));
 
-    EXPECT_TRUE(client::file_util::ReadFileToString(file_path, &trace_data_));
-    EXPECT_TRUE(CefDeleteFile(file_path, false));
+    // Wait for the test to complete.
+    completion_event_->Wait();
 
-    completion_event_->Signal();
+    // Verify the results.
+    EXPECT_TRUE(!trace_data_.empty());
+    EXPECT_TRUE(trace_type_ != NULL);
+    EXPECT_TRUE(strstr(trace_data_.c_str(), trace_type_) != NULL);
   }
 
-  // CefEndTracingCallback method:
-  void OnEndTracingComplete(const CefString& tracing_file) override {
-    EXPECT_UI_THREAD();
-
-    CefPostTask(TID_FILE, base::Bind(&TracingTestHandler::ReadTracingFile, this,
-                                     tracing_file));
-  }
-
-  void RunTracing() {
+  void BeginTracing() {
     EXPECT_UI_THREAD();
 
     // Results in a call to OnComplete.
@@ -105,6 +101,14 @@ class TracingTestHandler : public CefEndTracingCallback,
   void OnComplete() override {
     EXPECT_UI_THREAD();
 
+    // Add some delay to avoid timing-related test failures.
+    CefPostDelayedTask(TID_UI,
+                       base::Bind(&TracingTestHandler::TestTracing, this), 50);
+  }
+
+  void TestTracing() {
+    EXPECT_UI_THREAD();
+
     switch (type_) {
       case TT_TRACE_EVENT0: {
         TRACE_EVENT0(kTraceTestCategory, "TT_TRACE_EVENT0");
@@ -311,17 +315,20 @@ class TracingTestHandler : public CefEndTracingCallback,
     CefEndTracing(CefString(), this);
   }
 
-  void ExecuteTest() {
-    // Run the test.
-    CefPostTask(TID_UI, base::Bind(&TracingTestHandler::RunTracing, this));
+  void OnEndTracingComplete(const CefString& tracing_file) override {
+    EXPECT_UI_THREAD();
 
-    // Wait for the test to complete.
-    completion_event_->Wait();
+    CefPostTask(TID_FILE, base::Bind(&TracingTestHandler::ReadTracingFile, this,
+                                     tracing_file));
+  }
 
-    // Verify the results.
-    EXPECT_TRUE(!trace_data_.empty());
-    EXPECT_TRUE(trace_type_ != NULL);
-    EXPECT_TRUE(strstr(trace_data_.c_str(), trace_type_) != NULL);
+  void ReadTracingFile(const std::string& file_path) {
+    EXPECT_FILE_THREAD();
+
+    EXPECT_TRUE(client::file_util::ReadFileToString(file_path, &trace_data_));
+    EXPECT_TRUE(CefDeleteFile(file_path, false));
+
+    completion_event_->Signal();
   }
 
  private: