Chromium Code Reviews| 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() && |
|
khmel
2016/07/14 23:17:11
This logic was not 100% correct. There are many fa
xiyuan
2016/07/15 17:12:52
Acknowledged.
|
| - 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 { |