chrome/browser/extensions/api/feedback_private/feedback_private_api.cc - Issue 2201493002: [Merge to M53] arc: Implement safe access to ArcAuthService.

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: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

Issue 2201493002: [Merge to M53] arc: Implement safe access to ArcAuthService. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2785

Patch Set: Created 4 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc ('k') | chrome/browser/ui/app_list/app_list_service_views_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

index a9ddaeaeaabe73ba79fb81a73cf736984ae23e95..57796e860418ee2e70bdf72b89bced76a07288c3 100644

--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

@@ -157,13 +157,8 @@ bool FeedbackPrivateGetStringsFunction::RunSync() {

SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);

SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);

#if defined(OS_CHROMEOS)

- // We must check ArcBridgeService::available() before

- // ArcAuthService::IsArcEnabled() to avoid crashes in browsertests when

- // |profile_| is not set in ArcAuthService when ARC is not available.

- if (arc::ArcBridgeService::Get() &&

- arc::ArcBridgeService::Get()->available() &&

- arc::ArcAuthService::Get() &&

- arc::ArcAuthService::Get()->IsArcEnabled()) {

+ const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();

+ if (auth_service && auth_service->IsArcEnabled()) {

SET_STRING("sys-info",

IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX_ARC);

} else {