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/android/path_utils.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/macros.h" |
11 #include "base/memory/singleton.h" | 12 #include "base/memory/singleton.h" |
12 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
13 #include "base/message_loop/message_pump_android.h" | 14 #include "base/message_loop/message_pump_android.h" |
14 #include "base/path_service.h" | 15 #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) |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub)) | 174 if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub)) |
174 LOG(INFO) << "MessagePumpForUIFactory already set, unable to override."; | 175 LOG(INFO) << "MessagePumpForUIFactory already set, unable to override."; |
175 } | 176 } |
176 | 177 |
177 void InitAndroidTest() { | 178 void InitAndroidTest() { |
178 InitAndroidTestLogging(); | 179 InitAndroidTestLogging(); |
179 InitAndroidTestPaths(); | 180 InitAndroidTestPaths(); |
180 InitAndroidTestMessageLoop(); | 181 InitAndroidTestMessageLoop(); |
181 } | 182 } |
182 } // namespace base | 183 } // namespace base |
OLD | NEW |