Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7665)

Unified Diff: components/autofill/core/browser/personal_data_manager_mac.mm

Issue 1233983004: Remove base/mac/scoped_nsexception_enabler.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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
Index: components/autofill/core/browser/personal_data_manager_mac.mm
diff --git a/components/autofill/core/browser/personal_data_manager_mac.mm b/components/autofill/core/browser/personal_data_manager_mac.mm
index 1dcfbbc08a80d63ec21e4ad29eedc8fec5729350..5dfd5d763660de6042c5c16701315b30b9759ad8 100644
--- a/components/autofill/core/browser/personal_data_manager_mac.mm
+++ b/components/autofill/core/browser/personal_data_manager_mac.mm
@@ -11,7 +11,6 @@
#include "base/format_macros.h"
#include "base/guid.h"
#include "base/logging.h"
-#import "base/mac/scoped_nsexception_enabler.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/metrics/histogram_macros.h"
@@ -122,10 +121,10 @@ ABAddressBook* GetAddressBook(PrefService* pref_service) {
// +[ABAddressBook sharedAddressBook] throws an exception internally in
// circumstances that aren't clear. The exceptions are only observed in crash
// reports, so it is unknown whether they would be caught by AppKit and nil
- // returned, or if they would take down the app. In either case, avoid
- // crashing. http://crbug.com/129022
- ABAddressBook* addressBook = base::mac::RunBlockIgnoringExceptions(
- ^{ return [ABAddressBook sharedAddressBook]; });
+ // returned, or if they would take down the app.
+ // TODO(rsesek): If a crash is observed here, then the exception is not being
+ // caught by AppKit and it should be swallowed. http://crbug.com/129022
Avi (use Gerrit) 2015/07/28 13:23:17 I believe that exceptions actually do leak from he
Scott Hess - ex-Googler 2015/07/28 19:29:14 Looking at the crash server, I think it will be in
+ ABAddressBook* addressBook = [ABAddressBook sharedAddressBook];
UMA_HISTOGRAM_BOOLEAN("Autofill.AddressBookAvailable", addressBook != nil);
if (!g_accessed_address_book) {
« no previous file with comments | « chrome/browser/spellchecker/spellcheck_platform_mac.mm ('k') | media/capture/video/mac/video_capture_device_qtkit_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698