content/browser/browser_main_runner.cc - Issue 319053006: Calling Shutdown() for Android content_browsertests. Removed webrtc test hack.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_runner.cc

Issue 319053006: Calling Shutdown() for Android content_browsertests. Removed webrtc test hack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/android/java/src/org/chromium/base/SystemMessageHandler.java ('K') | « base/android/java/src/org/chromium/base/SystemMessageHandler.java ('k') | content/browser/media/webrtc_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_runner.cc

diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc

index 16309dec8460af490e891e47ace869c483d258c5..16eea346ec0e6a699cacc6ae47d261eb49f920ff 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)

+ // This is a hack for terminating the RunLoop inside MessagePumpForUI,

bulach 2014/06/09 09:26:45 nit: perhaps: // Forcefully terminates the RunLoo

Victor Starodub 2014/06/09 16:13:26 Done.

+ // used to ensure proper shutdown in content_browsertests. Shutdown() is

+ // not used by the actual android browser.

+ base::MessageLoop::current()->QuitNow();

+ #endif

main_loop_.reset(NULL);

notification_service_.reset(NULL);