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 /content/browser/browser_main_runner.cc | |
| 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 'content/browser/browser_main_runner.cc')
| -rw-r--r-- | content/browser/browser_main_runner.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc index 16309de..c41fc95 100644 --- a/content/browser/browser_main_runner.cc +++ b/content/browser/browser_main_runner.cc @@ -149,7 +149,12 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { #if defined(OS_WIN) ole_initializer_.reset(NULL); #endif - + #if defined(OS_ANDROID) + // Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring + // proper shutdown for content_browsertests. Shutdown() is not used by + // the actual browser. + base::MessageLoop::current()->QuitNow(); + #endif main_loop_.reset(NULL); notification_service_.reset(NULL); |