diff options
| author | starodub@google.com <starodub@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 09:04:32 +0000 |
|---|---|---|
| committer | starodub@google.com <starodub@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 09:04:32 +0000 |
| commit | d2cdd96176668dc823d36bad78df1186e6dbb5df (patch) | |
| tree | 4142c7324ad597baaddd086db4c5b7969dbe1b9c /base | |
| parent | 97276a0eb83d784dd24c3a1c2ff0b5bd1ed9a51e (diff) | |
| download | chromium_src-d2cdd96176668dc823d36bad78df1186e6dbb5df.zip chromium_src-d2cdd96176668dc823d36bad78df1186e6dbb5df.tar.gz chromium_src-d2cdd96176668dc823d36bad78df1186e6dbb5df.tar.bz2 | |
Calling Shutdown() for Android content_browsertests. Removed webrtc test hack.
Should be landed after:
https://codereview.chromium.org/323513003/
https://codereview.chromium.org/314293004/
which fix related shutdown issues.
BUG=367409,373249
Review URL: https://codereview.chromium.org/319053006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/java/src/org/chromium/base/SystemMessageHandler.java | 3 | ||||
| -rw-r--r-- | base/message_loop/message_pump_android.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/base/android/java/src/org/chromium/base/SystemMessageHandler.java b/base/android/java/src/org/chromium/base/SystemMessageHandler.java index 707adbe..e1fbb0f 100644 --- a/base/android/java/src/org/chromium/base/SystemMessageHandler.java +++ b/base/android/java/src/org/chromium/base/SystemMessageHandler.java @@ -46,8 +46,9 @@ class SystemMessageHandler extends Handler { @SuppressWarnings("unused") @CalledByNative - private void removeScheduledWork() { + private void removeAllPendingMessages() { removeMessages(SCHEDULED_WORK); + removeMessages(DELAYED_SCHEDULED_WORK); } @CalledByNative diff --git a/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc index ee8ff4d..babd17b 100644 --- a/base/message_loop/message_pump_android.cc +++ b/base/message_loop/message_pump_android.cc @@ -117,7 +117,7 @@ void MessagePumpForUI::Quit() { JNIEnv* env = base::android::AttachCurrentThread(); DCHECK(env); - Java_SystemMessageHandler_removeScheduledWork(env, + Java_SystemMessageHandler_removeAllPendingMessages(env, system_message_handler_obj_.obj()); system_message_handler_obj_.Reset(); } |