components/arc/arc_service_manager.cc - Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3.

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: components/arc/arc_service_manager.cc

Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3. (Closed)

Patch Set: Address comments. Created 4 years 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: components/arc/arc_service_manager.cc

diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc

index c8718242774ea13ed33c0567b2434af2bd22d20c..fd92b9d567a94e46c49fae1ff9dcaeb40dc4d46c 100644

--- a/components/arc/arc_service_manager.cc

+++ b/components/arc/arc_service_manager.cc

@@ -51,7 +51,8 @@ ArcServiceManager::~ArcServiceManager() {

// static

ArcServiceManager* ArcServiceManager::Get() {

- DCHECK(g_arc_service_manager);

+ if (!g_arc_service_manager)

+ return nullptr;

DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread());

return g_arc_service_manager;

}