DevTools: Parallelize trace messages serialization.

net/base/trace_net_log_observer_unittest.cc

 // Copyright 2014 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 "net/base/trace_net_log_observer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/debug/trace_event.h"
@@ skipping 67 matching lines @@
         json_output_.json_output,
         base::JSON_PARSE_RFC | base::JSON_DETACHABLE_CHILDREN));
 
     ASSERT_TRUE(trace_value) << json_output_.json_output;
     base::ListValue* trace_events = NULL;
     ASSERT_TRUE(trace_value->GetAsList(&trace_events));
 
     trace_events_ = FilterNetLogTraceEvents(*trace_events);
 
     if (!has_more_events)
-      run_loop->Quit();
+      message_loop_proxy_->PostTask(FROM_HERE, run_loop->QuitClosure());
   }
 
   static void EnableTraceLog() {
     TraceLog::GetInstance()->SetEnabled(
         base::debug::CategoryFilter(kNetLogTracingCategory),
         TraceLog::RECORDING_MODE,
         base::debug::TraceOptions());
   }
 
   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),
                    base::Unretained(&run_loop)));
     run_loop.Run();
   }
 
   void set_trace_net_log_observer(TraceNetLogObserver* trace_net_log_observer) {
     trace_net_log_observer_.reset(trace_net_log_observer);
   }
@@ skipping 31 matching lines @@
   TraceNetLogObserver* trace_net_log_observer() const {
     return trace_net_log_observer_.get();
   }
 
  private:
   scoped_ptr<base::ListValue> trace_events_;
   base::debug::TraceResultBuffer trace_buffer_;
   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) {
   trace_net_log_observer()->WatchForTraceStart(net_log());
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
 
   EndTraceAndFlush();
   trace_net_log_observer()->StopWatchForTraceStart();
 
   EXPECT_EQ(0u, trace_events()->GetSize());
@@ skipping 207 matching lines @@
   EXPECT_TRUE(item1->GetString("args.params.foo", &item1_params));
   EXPECT_EQ("bar", item1_params);
 
   EXPECT_TRUE(item2->GetString("args.params", &item2_params));
   EXPECT_TRUE(item2_params.empty());
 }
 
 }  // namespace
 
 }  // namespace net