OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/test/athena_test_helper.h" | 5 #include "athena/test/athena_test_helper.h" |
6 | 6 |
7 #include "athena/env/public/athena_env.h" | 7 #include "athena/env/public/athena_env.h" |
8 #include "athena/extensions/public/extensions_delegate.h" | 8 #include "athena/extensions/public/extensions_delegate.h" |
9 #include "athena/main/athena_launcher.h" | 9 #include "athena/main/public/athena_launcher.h" |
10 #include "athena/test/sample_activity_factory.h" | 10 #include "athena/test/sample_activity_factory.h" |
11 #include "athena/test/test_app_model_builder.h" | 11 #include "athena/test/test_app_model_builder.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "base/threading/thread.h" | 14 #include "base/threading/thread.h" |
15 #include "chromeos/dbus/dbus_thread_manager.h" | 15 #include "chromeos/dbus/dbus_thread_manager.h" |
16 #include "chromeos/network/network_handler.h" | 16 #include "chromeos/network/network_handler.h" |
17 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
18 #include "ui/aura/input_state_lookup.h" | 18 #include "ui/aura/input_state_lookup.h" |
19 #include "ui/aura/test/env_test_helper.h" | 19 #include "ui/aura/test/env_test_helper.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 | 91 |
92 void AthenaTestHelper::RunAllPendingInMessageLoop() { | 92 void AthenaTestHelper::RunAllPendingInMessageLoop() { |
93 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 93 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
94 // use run_loop.QuitClosure(). | 94 // use run_loop.QuitClosure(). |
95 base::RunLoop run_loop; | 95 base::RunLoop run_loop; |
96 run_loop.RunUntilIdle(); | 96 run_loop.RunUntilIdle(); |
97 } | 97 } |
98 | 98 |
99 } // namespace test | 99 } // namespace test |
100 } // namespace athena | 100 } // namespace athena |
OLD | NEW |