Allow CollectionViewModel/Controller queries without SectionIdentifier

ios/chrome/browser/ui/collection_view/collection_view_controller_unittest.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/collection_view/collection_view_controller.h"
 
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/test/base/scoped_block_swizzler.h"
 #include "ios/chrome/test/block_cleanup_test.h"
@@ skipping 26 matching lines @@
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
   SectionIdentifierFoo = kSectionIdentifierEnumZero,
 };
 
 typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeFooBar = kItemTypeEnumZero,
   ItemTypeFooBiz,
 };
 
-typedef void (^ReconfigureBlock)(CollectionViewController*,
-                                 NSArray*,
-                                 SectionIdentifier);
+typedef void (^ReconfigureBlock)(CollectionViewController*, NSArray*);
 
 class CollectionViewControllerTest : public BlockCleanupTest {
  public:
   void TestReconfigureBlock(ReconfigureBlock block) {
     // Setup.
     CollectionViewController* controller = [[CollectionViewController alloc]
         initWithStyle:CollectionViewControllerStyleDefault];
     [controller loadModel];
 
     CollectionViewModel* model = [controller collectionViewModel];
@@ skipping 32 matching lines @@
       ScopedBlockSwizzler swizzler([UICollectionView class],
                                    @selector(cellForItemAtIndexPath:),
                                    ^(id self) {
                                      return dummyCell;
                                    });
 
       NSArray* itemsToReconfigure = @[
         firstReconfiguredItem, secondReconfiguredItem, thirdReconfiguredItem
       ];
       // Action.
-      block(controller, itemsToReconfigure, SectionIdentifierFoo);
+      block(controller, itemsToReconfigure);
     }
 
     // Tests.
     EXPECT_TRUE([firstReconfiguredItem configureCellCalled]);
     EXPECT_TRUE([secondReconfiguredItem configureCellCalled]);
     EXPECT_TRUE([thirdReconfiguredItem configureCellCalled]);
 
     EXPECT_FALSE([firstNonReconfiguredItem configureCellCalled]);
     EXPECT_FALSE([secondNonReconfiguredItem configureCellCalled]);
   }
@@ skipping 25 matching lines @@
   [[controller collectionViewModel] addItem:someItem
                     toSectionWithIdentifier:SectionIdentifierFoo];
 
   ASSERT_EQ(NO, [someItem configureCellCalled]);
   [controller collectionView:[controller collectionView]
       cellForItemAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]];
   EXPECT_EQ(YES, [someItem configureCellCalled]);
 }
 
 TEST_F(CollectionViewControllerTest, ReconfigureCells) {
-  TestReconfigureBlock(^void(CollectionViewController* controller,
-                             NSArray* itemsToReconfigure,
-                             SectionIdentifier sectionIdentifier) {
-    [controller reconfigureCellsForItems:itemsToReconfigure
-                 inSectionWithIdentifier:sectionIdentifier];
-  });
+  TestReconfigureBlock(
+      ^void(CollectionViewController* controller, NSArray* itemsToReconfigure) {
+        [controller reconfigureCellsForItems:itemsToReconfigure];
+      });
 }
 
 TEST_F(CollectionViewControllerTest, ReconfigureCellsWithIndexPath) {
-  TestReconfigureBlock(^void(CollectionViewController* controller,
-                             NSArray* itemsToReconfigure,
-                             SectionIdentifier sectionIdentifier) {
-    // More setup.
-    NSMutableArray* indexPaths = [NSMutableArray array];
-    for (CollectionViewItem* item : itemsToReconfigure) {
-      NSIndexPath* indexPath =
-          [controller.collectionViewModel indexPathForItem:item
-                                   inSectionWithIdentifier:sectionIdentifier];
-      if (indexPath) {
-        [indexPaths addObject:indexPath];
-      }
-    }
+  TestReconfigureBlock(
+      ^void(CollectionViewController* controller, NSArray* itemsToReconfigure) {
+        // More setup.
+        NSMutableArray* indexPaths = [NSMutableArray array];
+        for (CollectionViewItem* item : itemsToReconfigure) {
+          NSIndexPath* indexPath =
+              [controller.collectionViewModel indexPathForItem:item];
+          if (indexPath) {
+            [indexPaths addObject:indexPath];
+          }
+        }
 
-    // Action.
-    [controller reconfigureCellsAtIndexPaths:indexPaths];
-  });
+        // Action.
+        [controller reconfigureCellsAtIndexPaths:indexPaths];
+      });
 }