| Index: chrome/app/chrome_breakpad_client_mac.mm
|
| diff --git a/chrome/app/chrome_breakpad_client_mac.mm b/chrome/app/chrome_breakpad_client_mac.mm
|
| index e841440b37143ea809f3cb3d2761abce5ca6ce0d..da6bc4452cc349c1cc1df6f7d8ec8063e636ef34 100644
|
| --- a/chrome/app/chrome_breakpad_client_mac.mm
|
| +++ b/chrome/app/chrome_breakpad_client_mac.mm
|
| @@ -42,15 +42,18 @@ void ChromeBreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) {
|
| #endif
|
| }
|
|
|
| -bool ChromeBreakpadClient::ReportingIsEnforcedByPolicy() {
|
| +bool ChromeBreakpadClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
| base::ScopedCFTypeRef<CFStringRef> key(
|
| base::SysUTF8ToCFStringRef(policy::key::kMetricsReportingEnabled));
|
| Boolean key_valid;
|
| Boolean metrics_reporting_enabled = CFPreferencesGetAppBooleanValue(key,
|
| kCFPreferencesCurrentApplication, &key_valid);
|
| - return key_valid &&
|
| - CFPreferencesAppValueIsForced(key, kCFPreferencesCurrentApplication) &&
|
| - metrics_reporting_enabled;
|
| + if (key_valid &&
|
| + CFPreferencesAppValueIsForced(key, kCFPreferencesCurrentApplication)) {
|
| + *breakpad_enabled = metrics_reporting_enabled;
|
| + return true;
|
| + }
|
| + return false;
|
| }
|
|
|
| } // namespace chrome
|
|
|