| Index: content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 255778590f65c7a3e1b392c800b725faef4b83e5..4e349a7c3855a76e74fb3967fe2ba9abcd023db3 100644
|
| --- a/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/media/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/ref_counted_memory.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/test/trace_event_analyzer.h"
|
| +#include "base/threading/thread_restrictions.h"
|
| #include "base/trace_event/trace_event_impl.h"
|
| #include "base/values.h"
|
| #include "build/build_config.h"
|
| @@ -102,7 +103,12 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest {
|
| void StopTracing() {
|
| CHECK(message_loop_runner_.get() == NULL)
|
| << "Calling StopTracing more than once";
|
| - trace_log_->SetDisabled();
|
| +
|
| + {
|
| + base::ThreadRestrictions::ScopedAllowIO allow_thread_join_caused_by_test;
|
| + trace_log_->SetDisabled();
|
| + }
|
| +
|
| message_loop_runner_ = new MessageLoopRunner;
|
| trace_log_->Flush(base::Bind(
|
| &WebRtcGetUserMediaBrowserTest::OnTraceDataCollected,
|
|
|