diff options
| author | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-22 20:56:30 +0000 |
|---|---|---|
| committer | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-22 20:56:30 +0000 |
| commit | f70eac0ea8b5f05302b70211c6d1e6afb92f552f (patch) | |
| tree | e0c57ffdd0125e6aa4137a81a74cdcfe02c9563b /base/message_loop | |
| parent | 57e6eb80bebfd196e2efeb44f396aa3b12a177f5 (diff) | |
| download | chromium_src-f70eac0ea8b5f05302b70211c6d1e6afb92f552f.zip chromium_src-f70eac0ea8b5f05302b70211c6d1e6afb92f552f.tar.gz chromium_src-f70eac0ea8b5f05302b70211c6d1e6afb92f552f.tar.bz2 | |
Revert of [Mac] Reland r276808 Use a native MessagePump instead of a MessagePumpDefault (https://coderevie… (https://codereview.chromium.org/331983002/)
Reason for revert:
Breaks XmppConnectionTest.MultipleConnect on Mac: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/50525
Original issue's description:
> Reland change to use a native MessagePump instead of a MessagePumpDefault.
> Original CL: https://codereview.chromium.org/331513002/
>
> The previous CL caused a bunch of LibJingle unit tests to fail because the tests
> were using a gtest death test which runs in the context of a fork()ed but not
> execu()ed process.
>
> A CF Message loop can't live in this environment. Explicitly construct a
> MessagePumpDefault for these tests.
>
> BUG=356804,385604
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=279013
TBR=mark@chromium.org,ajwong@chromium.org,jeremy@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=356804,385604
Review URL: https://codereview.chromium.org/332333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 10 | ||||
| -rw-r--r-- | base/message_loop/message_pump_default.h | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index ccece4d..dd1a393 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -229,14 +229,6 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { #define MESSAGE_PUMP_UI scoped_ptr<MessagePump>(new MessagePumpForUI()) #endif -#if defined(OS_MACOSX) - // Use an OS native runloop on Mac to support timer coalescing. - #define MESSAGE_PUMP_DEFAULT \ - scoped_ptr<MessagePump>(new MessagePumpCFRunLoop()) -#else - #define MESSAGE_PUMP_DEFAULT scoped_ptr<MessagePump>(new MessagePumpDefault()) -#endif - if (type == MessageLoop::TYPE_UI) { if (message_pump_for_ui_factory_) return message_pump_for_ui_factory_(); @@ -251,7 +243,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { #endif DCHECK_EQ(MessageLoop::TYPE_DEFAULT, type); - return MESSAGE_PUMP_DEFAULT; + return scoped_ptr<MessagePump>(new MessagePumpDefault()); } void MessageLoop::AddDestructionObserver( diff --git a/base/message_loop/message_pump_default.h b/base/message_loop/message_pump_default.h index 19e7200..a9b83e8 100644 --- a/base/message_loop/message_pump_default.h +++ b/base/message_loop/message_pump_default.h @@ -5,14 +5,13 @@ #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_DEFAULT_H_ #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_DEFAULT_H_ -#include "base/base_export.h" #include "base/message_loop/message_pump.h" #include "base/synchronization/waitable_event.h" #include "base/time/time.h" namespace base { -class BASE_EXPORT MessagePumpDefault : public MessagePump { +class MessagePumpDefault : public MessagePump { public: MessagePumpDefault(); virtual ~MessagePumpDefault(); |