diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:21:00 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:21:00 +0000 |
| commit | 5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3 (patch) | |
| tree | 305984b92fdec4b0bc7c0e34393b52a37a173ec8 /base | |
| parent | 5cba6d8eb4b4072b3d38fb79e03322bc627672f5 (diff) | |
| download | chromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.zip chromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.tar.gz chromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/message_loop.cc | 7 | ||||
| -rw-r--r-- | base/message_loop.h | 7 | ||||
| -rw-r--r-- | base/test/test_support_android.cc | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 5428026..0a6bf6c 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -251,9 +251,12 @@ void MessageLoop::EnableHistogrammer(bool enable) { } // static -void MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) { - DCHECK(!message_pump_for_ui_factory_); +bool MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) { + if (message_pump_for_ui_factory_) + return false; + message_pump_for_ui_factory_ = factory; + return true; } void MessageLoop::AddDestructionObserver( diff --git a/base/message_loop.h b/base/message_loop.h index 446a520..b690940 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -120,9 +120,10 @@ class BASE_EXPORT MessageLoop : public base::MessagePump::Delegate { static void EnableHistogrammer(bool enable_histogrammer); typedef base::MessagePump* (MessagePumpFactory)(); - // Using the given base::MessagePumpForUIFactory to override the default - // MessagePump implementation for 'TYPE_UI'. - static void InitMessagePumpForUIFactory(MessagePumpFactory* factory); + // 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); // 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 8b512f4..e38a897 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() { |