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

Unified Diff: base/test/test_support_android.cc

Issue 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/message_loop.cc ('k') | build/android/adb_gdb_content_shell » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_support_android.cc
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index 8b512f46d725cbc3e3ba4a7dcbaf5178381bfb8f..e38a897f1291fe4101db127fbf4009234d81a535 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -183,7 +183,8 @@ void InitAndroidTestPaths() {
}
void InitAndroidTestMessageLoop() {
- MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub);
+ if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
+ LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
}
void InitAndroidTest() {
« no previous file with comments | « base/message_loop.cc ('k') | build/android/adb_gdb_content_shell » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698