[iOS] Rename ReadingListCollectionViewAccessibilityDelegate.

This has been renamed to ReadingListListViewAccessibilityDelegate, and
its interface has been updated to use ListItems rather than
CollectionViewItems so the protocol can be shared between
implementations.

Bug: 805209
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ief145a21be03ae1bfeb23419e57875be8128c1d6
Reviewed-on: https://chromium-review.googlesource.com/1102125Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570159}

ios/chrome/browser/ui/reading_list/BUILD.gn

@@ -65,11 +65,11 @@ source_set("reading_list_ui") {
     "reading_list_collection_view_cell.mm",
     "reading_list_collection_view_controller.h",
     "reading_list_collection_view_controller.mm",
-    "reading_list_collection_view_item_accessibility_delegate.h",
     "reading_list_data_sink.h",
     "reading_list_data_source.h",
     "reading_list_empty_collection_background.h",
     "reading_list_empty_collection_background.mm",
+    "reading_list_list_view_item_accessibility_delegate.h",
     "reading_list_toolbar.h",
     "reading_list_toolbar.mm",
     "reading_list_toolbar_button.h",

ios/chrome/browser/ui/reading_list/reading_list_collection_view_controller.mm

@@ -13,10 +13,10 @@
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/list_model/list_item+Controller.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item_accessibility_delegate.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_data_sink.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_data_source.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_empty_collection_background.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_list_view_item_accessibility_delegate.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_toolbar.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
@@ -45,7 +45,7 @@ typedef void (^EntryUpdater)(CollectionViewItem* item);
 }
 
 @interface ReadingListCollectionViewController ()<
-    ReadingListCollectionViewItemAccessibilityDelegate,
+    ReadingListListViewItemAccessibilityDelegate,
     ReadingListDataSink,
     UIGestureRecognizerDelegate> {
   // Toolbar with the actions.
@@ -327,7 +327,7 @@ typedef void (^EntryUpdater)(CollectionViewItem* item);
   [_actionSheet stop];
 }
 
-#pragma mark - ReadingListCollectionViewItemAccessibilityDelegate
+#pragma mark - ReadingListListViewItemAccessibilityDelegate
 
 - (BOOL)isEntryRead:(CollectionViewItem*)entry {
   return [self.dataSource isEntryRead:entry];

ios/chrome/browser/ui/reading_list/reading_list_collection_view_item.h

@@ -11,7 +11,7 @@
 
 class GURL;
 @class FaviconAttributes;
-@protocol ReadingListCollectionViewItemAccessibilityDelegate;
+@protocol ReadingListListViewItemAccessibilityDelegate;
 
 // Collection view item for representing a ReadingListEntry.
 @interface ReadingListCollectionViewItem : CollectionViewItem
@@ -31,9 +31,8 @@ class GURL;
 // Timestamp of the distillation in microseconds since Jan 1st 1970.
 @property(nonatomic, assign) int64_t distillationDate;
 // Delegate for the accessibility actions.
-@property(nonatomic, weak)
-    id<ReadingListCollectionViewItemAccessibilityDelegate>
-        accessibilityDelegate;
+@property(nonatomic, weak) id<ReadingListListViewItemAccessibilityDelegate>
+    accessibilityDelegate;
 // Attributes for favicon.
 @property(nonatomic, strong) FaviconAttributes* attributes;
 

ios/chrome/browser/ui/reading_list/reading_list_collection_view_item.mm

@@ -7,7 +7,7 @@
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/ui/favicon/favicon_view.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_cell.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item_accessibility_delegate.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_list_view_item_accessibility_delegate.h"
 #import "ios/chrome/browser/ui/util/pasteboard_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"

ios/chrome/browser/ui/reading_list/reading_list_collection_view_item_accessibility_delegate.h

-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_COLLECTION_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_
-#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_COLLECTION_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_
-
-@class CollectionViewItem;
-
-@protocol ReadingListCollectionViewItemAccessibilityDelegate
-
-// Returns whether the entry is read.
-- (BOOL)isEntryRead:(CollectionViewItem*)entry;
-
-- (void)deleteEntry:(CollectionViewItem*)entry;
-- (void)openEntryInNewTab:(CollectionViewItem*)entry;
-- (void)openEntryInNewIncognitoTab:(CollectionViewItem*)entry;
-- (void)openEntryOffline:(CollectionViewItem*)entry;
-- (void)markEntryRead:(CollectionViewItem*)entry;
-- (void)markEntryUnread:(CollectionViewItem*)entry;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_COLLECTION_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_

ios/chrome/browser/ui/reading_list/reading_list_data_source.h

@@ -9,7 +9,7 @@
 
 @class CollectionViewItem;
 @protocol ReadingListDataSink;
-@protocol ReadingListCollectionViewItemAccessibilityDelegate;
+@protocol ReadingListListViewItemAccessibilityDelegate;
 
 // Data Source for the Reading List UI, providing the data sink with the data to
 // be displayed. Handle the interactions with the model.
@@ -40,7 +40,7 @@
 - (void)fillReadItems:(nullable NSMutableArray<CollectionViewItem*>*)readArray
           unreadItems:(nullable NSMutableArray<CollectionViewItem*>*)unreadArray
          withDelegate:
-             (nullable id<ReadingListCollectionViewItemAccessibilityDelegate>)
+             (nullable id<ReadingListListViewItemAccessibilityDelegate>)
                  delegate;
 
 // Fetches the |faviconURL| of this |item|, notifies the data sink when

ios/chrome/browser/ui/reading_list/reading_list_list_view_item_accessibility_delegate.h

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_LIST_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_
+#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_LIST_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_
+
+@class ListItem;
+
+@protocol ReadingListListViewItemAccessibilityDelegate
+
+// Returns whether the entry is read.
+- (BOOL)isEntryRead:(ListItem*)item;
+
+- (void)deleteEntry:(ListItem*)item;
+- (void)openEntryInNewTab:(ListItem*)item;
+- (void)openEntryInNewIncognitoTab:(ListItem*)item;
+- (void)openEntryOffline:(ListItem*)item;
+- (void)markEntryRead:(ListItem*)item;
+- (void)markEntryUnread:(ListItem*)item;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_LIST_VIEW_ITEM_ACCESSIBILITY_DELEGATE_H_

ios/chrome/browser/ui/reading_list/reading_list_mediator.mm

@@ -16,8 +16,8 @@
 #import "ios/chrome/browser/ui/favicon/favicon_attributes_provider.h"
 #import "ios/chrome/browser/ui/favicon/favicon_view.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item_accessibility_delegate.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_data_sink.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_list_view_item_accessibility_delegate.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_utils.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -123,7 +123,7 @@ bool EntrySorter(const ReadingListEntry* rhs, const ReadingListEntry* lhs) {
 - (void)fillReadItems:(NSMutableArray<CollectionViewItem*>*)readArray
           unreadItems:(NSMutableArray<CollectionViewItem*>*)unreadArray
          withDelegate:
-             (id<ReadingListCollectionViewItemAccessibilityDelegate>)delegate {
+             (id<ReadingListListViewItemAccessibilityDelegate>)delegate {
   std::vector<const ReadingListEntry*> readEntries;
   std::vector<const ReadingListEntry*> unreadEntries;
 
@@ -260,8 +260,7 @@ bool EntrySorter(const ReadingListEntry* rhs, const ReadingListEntry* lhs) {
 - (ReadingListCollectionViewItem*)
 cellItemForReadingListEntry:(const ReadingListEntry*)entry
                withDelegate:
-                   (id<ReadingListCollectionViewItemAccessibilityDelegate>)
-                       delegate {
+                   (id<ReadingListListViewItemAccessibilityDelegate>)delegate {
   const GURL& url = entry->URL();
   ReadingListCollectionViewItem* item = [[ReadingListCollectionViewItem alloc]
            initWithType:0

ios/chrome/browser/ui/reading_list/reading_list_mediator_unittest.mm

@@ -14,7 +14,7 @@
 #include "components/url_formatter/url_formatter.h"
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
 #import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_collection_view_item_accessibility_delegate.h"
+#import "ios/chrome/browser/ui/reading_list/reading_list_list_view_item_accessibility_delegate.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -78,8 +78,8 @@ TEST_F(ReadingListMediatorTest, fillItems) {
   // Setup.
   NSMutableArray<CollectionViewItem*>* readArray = [NSMutableArray array];
   NSMutableArray<CollectionViewItem*>* unreadArray = [NSMutableArray array];
-  id mockDelegate = OCMProtocolMock(
-      @protocol(ReadingListCollectionViewItemAccessibilityDelegate));
+  id mockDelegate =
+      OCMProtocolMock(@protocol(ReadingListListViewItemAccessibilityDelegate));
 
   // Action.
   [mediator_ fillReadItems:readArray