content/browser/browser_main_runner.cc - Issue 2818533003: Make nesting/running states a RunLoop rather than a MessageLoop concept.

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 2818533003: Make nesting/running states a RunLoop rather than a MessageLoop concept. (Closed)

Patch Set: still need to check MessageLoop::current() in Mojo's RunLoopNestingObserver::GetForThread() Created 3 years, 7 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:

Index: content/browser/browser_main_runner.cc

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

index 0d986c057b7be1c05486d300d46e34d3cb6e8aef..2499e1b27261c4fd18de37e5ce0d42757eaf4838 100644

--- a/content/browser/browser_main_runner.cc

+++ b/content/browser/browser_main_runner.cc

@@ -14,6 +14,7 @@

#include "base/metrics/statistics_recorder.h"

#include "base/profiler/scoped_profile.h"

#include "base/profiler/scoped_tracker.h"

+#include "base/run_loop.h"

#include "base/time/time.h"

#include "base/trace_event/heap_profiler_allocation_context_tracker.h"

#include "base/trace_event/trace_event.h"

@@ -207,7 +208,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {

// Forcefully terminates the RunLoop inside MessagePumpForUI, ensuring

// proper shutdown for content_browsertests. Shutdown() is not used by

// the actual browser.

- if (base::MessageLoop::current()->is_running())

+ if (base::RunLoop::IsRunningOnCurrentThread())

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

#endif

main_loop_.reset(NULL);