Revert 179189
Failed to rename package name in buildbot scripts. Broke buildbots.
> Add apk for running content_browsertests
>
> Split off org.chromium.content_shell into:
> org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets
> org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application
> org.chromium.content_browsertests_apk - application code to build content_browsertests_apk
>
> Also splitting content/shell/android/res into:
> - content/shell/android/java/res
> - content/shell/android/shell_apk/res
>
> Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser.
>
> I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package.
>
> BUG=138275
>
>
> Review URL: https://chromiumcodereview.appspot.com/12047068
TBR=nileshagrawal@chromium.org
Review URL: https://codereview.chromium.org/12088031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179211 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 0a6bf6c..5428026 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -251,12 +251,9 @@
}
// static
-bool MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) {
- if (message_pump_for_ui_factory_)
- return false;
-
+void MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) {
+ DCHECK(!message_pump_for_ui_factory_);
message_pump_for_ui_factory_ = factory;
- return true;
}
void MessageLoop::AddDestructionObserver(
diff --git a/base/message_loop.h b/base/message_loop.h
index b690940..446a520 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -120,10 +120,9 @@
static void EnableHistogrammer(bool enable_histogrammer);
typedef base::MessagePump* (MessagePumpFactory)();
- // Uses the given base::MessagePumpForUIFactory to override the default
- // MessagePump implementation for 'TYPE_UI'. Returns true if the factory
- // was successfully registered.
- static bool InitMessagePumpForUIFactory(MessagePumpFactory* factory);
+ // Using the given base::MessagePumpForUIFactory to override the default
+ // MessagePump implementation for 'TYPE_UI'.
+ static void InitMessagePumpForUIFactory(MessagePumpFactory* factory);
// A DestructionObserver is notified when the current MessageLoop is being
// destroyed. These observers are notified prior to MessageLoop::current()
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index e38a897..8b512f4 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -183,8 +183,7 @@
}
void InitAndroidTestMessageLoop() {
- if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
- LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
+ MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub);
}
void InitAndroidTest() {