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 <stdarg.h> | 5 #include <stdarg.h> |
6 #include <string.h> | 6 #include <string.h> |
7 | 7 |
8 #include "base/android/path_utils.h" | 8 #include "base/base_paths_android.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/path_service.h" |
| 12 #include "base/android/path_utils.h" |
11 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
12 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
13 #include "base/message_pump_android.h" | 15 #include "base/message_pump_android.h" |
14 #include "base/path_service.h" | |
15 #include "base/synchronization/waitable_event.h" | 16 #include "base/synchronization/waitable_event.h" |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 struct RunState { | 20 struct RunState { |
20 RunState(base::MessagePump::Delegate* delegate, int run_depth) | 21 RunState(base::MessagePump::Delegate* delegate, int run_depth) |
21 : delegate(delegate), | 22 : delegate(delegate), |
22 run_depth(run_depth), | 23 run_depth(run_depth), |
23 should_quit(false) { | 24 should_quit(false) { |
24 } | 25 } |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 void InitAndroidTestMessageLoop() { | 188 void InitAndroidTestMessageLoop() { |
188 MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub); | 189 MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub); |
189 } | 190 } |
190 | 191 |
191 void InitAndroidTest() { | 192 void InitAndroidTest() { |
192 InitAndroidTestLogging(); | 193 InitAndroidTestLogging(); |
193 InitAndroidTestPaths(); | 194 InitAndroidTestPaths(); |
194 InitAndroidTestMessageLoop(); | 195 InitAndroidTestMessageLoop(); |
195 } | 196 } |
196 } // namespace base | 197 } // namespace base |
OLD | NEW |