Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: trunk/src/base/test/test_support_android.cc

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/message_loop/message_pump_android.h" 13 #include "base/message_pump_android.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/synchronization/waitable_event.h" 15 #include "base/synchronization/waitable_event.h"
16 16
17 namespace { 17 namespace {
18 18
19 struct RunState { 19 struct RunState {
20 RunState(base::MessagePump::Delegate* delegate, int run_depth) 20 RunState(base::MessagePump::Delegate* delegate, int run_depth)
21 : delegate(delegate), 21 : delegate(delegate),
22 run_depth(run_depth), 22 run_depth(run_depth),
23 should_quit(false) { 23 should_quit(false) {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub)) 186 if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
187 LOG(INFO) << "MessagePumpForUIFactory already set, unable to override."; 187 LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
188 } 188 }
189 189
190 void InitAndroidTest() { 190 void InitAndroidTest() {
191 InitAndroidTestLogging(); 191 InitAndroidTestLogging();
192 InitAndroidTestPaths(); 192 InitAndroidTestPaths();
193 InitAndroidTestMessageLoop(); 193 InitAndroidTestMessageLoop();
194 } 194 }
195 } // namespace base 195 } // namespace base
OLDNEW
« no previous file with comments | « trunk/src/base/test/mock_chrome_application_mac.h ('k') | trunk/src/base/test/test_support_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698