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

Unified Diff: ios/chrome/browser/share_extension/share_extension_item_receiver.mm

Issue 2522943003: [iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC. (Closed)
Patch Set: Use EXPECT_NSEQ instead of EXPECT_EQ/EXPECT_TRUE. Created 4 years, 1 month 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: ios/chrome/browser/share_extension/share_extension_item_receiver.mm
diff --git a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm
index 0bf45a96f6930e3e606573e59ed36d3ed25fe680..bbe2a572aa0f3d512a19547e3131adfd3d4d90bb 100644
--- a/ios/chrome/browser/share_extension/share_extension_item_receiver.mm
+++ b/ios/chrome/browser/share_extension/share_extension_item_receiver.mm
@@ -110,7 +110,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
_bookmarkModel = bookmarkModel;
web::WebThread::PostTask(web::WebThread::FILE, FROM_HERE,
- base::BindBlock(^() {
+ base::BindBlockArc(^() {
[self createReadingListFolder];
}));
[[NSNotificationCenter defaultCenter]
@@ -149,7 +149,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
error:nil];
}
web::WebThread::PostTask(
- web::WebThread::UI, FROM_HERE, base::BindBlock(^() {
+ web::WebThread::UI, FROM_HERE, base::BindBlockArc(^() {
if ([[UIApplication sharedApplication] applicationState] ==
UIApplicationStateActive) {
_folderCreated = YES;
@@ -205,7 +205,8 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
[[NSDate date] timeIntervalSinceDate:entryDate]));
// Entry is valid. Add it to the reading list model.
- web::WebThread::PostTask(web::WebThread::UI, FROM_HERE, base::BindBlock(^() {
+ web::WebThread::PostTask(web::WebThread::UI, FROM_HERE,
+ base::BindBlockArc(^() {
if (!_readingListModel || !_bookmarkModel) {
// Models may have been deleted after the file
// processing started.
@@ -228,7 +229,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
if (completion) {
web::WebThread::PostTask(web::WebThread::FILE,
FROM_HERE,
- base::BindBlock(^() {
+ base::BindBlockArc(^() {
completion();
}));
}
@@ -292,7 +293,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
// There may already be files. Process them.
web::WebThread::PostTask(
- web::WebThread::FILE, FROM_HERE, base::BindBlock(^() {
+ web::WebThread::FILE, FROM_HERE, base::BindBlockArc(^() {
NSArray<NSURL*>* files = [[NSFileManager defaultManager]
contentsOfDirectoryAtURL:[self presentedItemURL]
includingPropertiesForKeys:nil
@@ -302,7 +303,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
return;
}
web::WebThread::PostTask(
- web::WebThread::UI, FROM_HERE, base::BindBlock(^() {
+ web::WebThread::UI, FROM_HERE, base::BindBlockArc(^() {
UMA_HISTOGRAM_COUNTS_100(
"IOS.ShareExtension.ReceivedEntriesCount", [files count]);
for (NSURL* fileURL : files) {
@@ -310,12 +311,12 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
ReadingListModel::ScopedReadingListBatchUpdate>
batchToken(_readingListModel->BeginBatchUpdates());
web::WebThread::PostTask(
- web::WebThread::FILE, FROM_HERE, base::BindBlock(^() {
+ web::WebThread::FILE, FROM_HERE, base::BindBlockArc(^() {
[self handleFileAtURL:fileURL
withCompletion:^{
web::WebThread::PostTask(web::WebThread::UI,
FROM_HERE,
- base::BindBlock(^() {
+ base::BindBlockArc(^() {
batchToken.reset();
}));
}];
@@ -338,7 +339,7 @@ void LogHistogramReceivedItem(ShareExtensionItemReceived type) {
- (void)presentedSubitemDidChangeAtURL:(NSURL*)url {
web::WebThread::PostTask(web::WebThread::FILE, FROM_HERE,
- base::BindBlock(^() {
+ base::BindBlockArc(^() {
[self handleFileAtURL:url withCompletion:nil];
}));
}

Powered by Google App Engine
This is Rietveld 408576698