| Index: chrome/test/base/tracing.cc
|
| diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
|
| index 790ab3c8016dde6ea53f0af9b6a6c8da843fd88c..b770be8fa7df9c8e9f9d80b25ce083d58e86dad4 100644
|
| --- a/chrome/test/base/tracing.cc
|
| +++ b/chrome/test/base/tracing.cc
|
| @@ -38,7 +38,7 @@ class InProcessTraceController : public content::TraceSubscriber {
|
| return false;
|
| // Wait for OnEndTracingComplete() to quit the message loop.
|
| // OnTraceDataCollected may be called multiple times while blocking here.
|
| - ui_test_utils::RunMessageLoop();
|
| + message_loop_runner_.Run();
|
| trace_buffer_.Finish();
|
| trace_buffer_.SetOutputCallback(TraceResultBuffer::OutputCallback());
|
|
|
| @@ -51,7 +51,7 @@ class InProcessTraceController : public content::TraceSubscriber {
|
|
|
| // TraceSubscriber
|
| virtual void OnEndTracingComplete() OVERRIDE {
|
| - MessageLoopForUI::current()->Quit();
|
| + message_loop_runner_.QuitNow();
|
| }
|
|
|
| // TraceSubscriber
|
| @@ -63,6 +63,8 @@ class InProcessTraceController : public content::TraceSubscriber {
|
| // For collecting trace data asynchronously.
|
| base::debug::TraceResultBuffer trace_buffer_;
|
|
|
| + ui_test_utils::MessageLoopRunner message_loop_runner_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(InProcessTraceController);
|
| };
|
|
|
|
|