athena/main/athena_launcher.cc - Issue 597543002: Fix crash which occurs when combining AthenaTestBase tests and other tests

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: athena/main/athena_launcher.cc

Issue 597543002: Fix crash which occurs when combining AthenaTestBase tests and other tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

Index: athena/main/athena_launcher.cc

diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc

index d0cd9c1e6331251ebd9a7c1a8b3b3a374f097542..93bb6e31c5a706d02fe8bed1bfbdfcfaa17ee2f1 100644

--- a/athena/main/athena_launcher.cc

+++ b/athena/main/athena_launcher.cc

@@ -166,6 +166,7 @@ void ShutdownAthena() {

athena::AthenaEnv::Shutdown();

delete views::ViewsDelegate::views_delegate;

+ views::ViewsDelegate::views_delegate = NULL;

}

} // namespace athena

« no previous file with comments | « no previous file | no next file » | no next file with comments »