OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/aura/test/aura_test_helper.h" | 5 #include "ui/aura/test/aura_test_helper.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/default_activation_client.h" | 10 #include "ui/aura/client/default_activation_client.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 ui::ShutdownInputMethodForTesting(); | 108 ui::ShutdownInputMethodForTesting(); |
109 | 109 |
110 Env::DeleteInstance(); | 110 Env::DeleteInstance(); |
111 | 111 |
112 ui::TerminateContextFactoryForTests(); | 112 ui::TerminateContextFactoryForTests(); |
113 } | 113 } |
114 | 114 |
115 void AuraTestHelper::RunAllPendingInMessageLoop() { | 115 void AuraTestHelper::RunAllPendingInMessageLoop() { |
116 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 116 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
117 // use run_loop.QuitClosure(). | 117 // use run_loop.QuitClosure(). |
118 base::RunLoop run_loop(Env::GetInstance()->GetDispatcher()); | 118 base::RunLoop run_loop; |
119 run_loop.RunUntilIdle(); | 119 run_loop.RunUntilIdle(); |
120 } | 120 } |
121 | 121 |
122 } // namespace test | 122 } // namespace test |
123 } // namespace aura | 123 } // namespace aura |
OLD | NEW |