Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: net/base/trace_net_log_observer_unittest.cc

Issue 750183008: DevTools: Parallelize trace messages serialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests were fixed Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/trace_net_log_observer_unittest.cc
diff --git a/net/base/trace_net_log_observer_unittest.cc b/net/base/trace_net_log_observer_unittest.cc
index 5256bac9c8a2fb9c92b80ea50dda3c7cc4625d51..9c75d7d16a7e290705e90e04a279e9f7d4d61c5d 100644
--- a/net/base/trace_net_log_observer_unittest.cc
+++ b/net/base/trace_net_log_observer_unittest.cc
@@ -85,7 +85,7 @@ class TraceNetLogObserverTest : public testing::Test {
trace_events_ = FilterNetLogTraceEvents(*trace_events);
if (!has_more_events)
- run_loop->Quit();
+ message_loop_proxy_->PostTask(FROM_HERE, run_loop->QuitClosure());
}
static void EnableTraceLog() {
@@ -98,6 +98,7 @@ class TraceNetLogObserverTest : public testing::Test {
void EndTraceAndFlush() {
base::RunLoop run_loop;
TraceLog::GetInstance()->SetDisabled();
+ message_loop_proxy_ = base::MessageLoopProxy::current();
TraceLog::GetInstance()->Flush(
base::Bind(&TraceNetLogObserverTest::OnTraceDataCollected,
base::Unretained(this),
@@ -149,6 +150,7 @@ class TraceNetLogObserverTest : public testing::Test {
base::debug::TraceResultBuffer::SimpleOutput json_output_;
CapturingNetLog net_log_;
scoped_ptr<TraceNetLogObserver> trace_net_log_observer_;
+ scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
};
TEST_F(TraceNetLogObserverTest, TracingNotEnabled) {
« base/debug/trace_event_impl.cc ('K') | « content/browser/media/webrtc_getusermedia_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698