CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm

Index: ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm b/ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm
index df84898983330d55616d0885c6db7c5101782f37..e09a490b5fccdbd813cda1b3f6f0f32eddd23818 100644
--- a/ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.mm
@@ -26,6 +26,7 @@
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_switch_item.h"
+#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h"
 #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/content_suggestions/cells/content_suggestions_article_item.h"
@@ -63,9 +64,9 @@ typedef NS_ENUM(NSInteger, SectionIdentifier) {
 };
 
 typedef NS_ENUM(NSInteger, ItemType) {
-  ItemTypeTextCheckmark = kItemTypeEnumZero,
-  ItemTypeTextDetail,
+  ItemTypeTextDetail = kItemTypeEnumZero,
   ItemTypeText,
+  ItemTypeSmallText,
   ItemTypeTextError,
   ItemTypeDetailBasic,
   ItemTypeDetailLeftMedium,
@@ -119,8 +120,6 @@ const CGFloat kHorizontalImageFixedSize = 40;
   CollectionViewTextItem* textHeader =
       [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];
   textHeader.text = @"CollectionViewTextCell";
-  textHeader.textFont = [MDCTypography body2Font];
-  textHeader.textColor = [[MDCPalette greyPalette] tint500];
   [model setHeader:textHeader
       forSectionWithIdentifier:SectionIdentifierTextCell];
 
@@ -145,7 +144,6 @@ const CGFloat kHorizontalImageFixedSize = 40;
   CollectionViewTextItem* smallTextCell =
       [[CollectionViewTextItem alloc] initWithType:ItemTypeText];
   smallTextCell.text = @"Text cell with small font but height of 48.";
-  smallTextCell.textFont = [smallTextCell.textFont fontWithSize:8];
   [model addItem:smallTextCell
       toSectionWithIdentifier:SectionIdentifierTextCell];
 
@@ -349,6 +347,35 @@ const CGFloat kHorizontalImageFixedSize = 40;
   self.styler.cellStyle = MDCCollectionViewCellStyleCard;
 }
 
+#pragma mark - UICollectionViewDataSource
+
+- (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView
+                 cellForItemAtIndexPath:(NSIndexPath*)indexPath {
+  UICollectionViewCell* cell =
+      [super collectionView:collectionView cellForItemAtIndexPath:indexPath];
+
+  NSInteger itemType =
+      [self.collectionViewModel itemTypeForIndexPath:indexPath];
+  switch (itemType) {
+    case ItemTypeHeader: {
+      CollectionViewTextCell* textCell =
+          base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+      textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
+      break;
+    }
+    case ItemTypeSmallText: {
+      CollectionViewTextCell* textCell =
+          base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+      textCell.textLabel.font =
+          [[MDCTypography fontLoader] regularFontOfSize:8];
+      break;
+    }
+    default:
+      break;
+  }
+  return cell;
+}
+
 #pragma mark MDCCollectionViewStylingDelegate
 
 - (CGFloat)collectionView:(nonnull UICollectionView*)collectionView
@@ -361,9 +388,9 @@ const CGFloat kHorizontalImageFixedSize = 40;
     case ItemTypeSwitchDynamicHeight:
     case ItemTypeSwitchSync:
     case ItemTypeAccountControlDynamicHeight:
-    case ItemTypeTextCheckmark:
     case ItemTypeTextDetail:
     case ItemTypeText:
+    case ItemTypeSmallText:
     case ItemTypeTextError:
     case ItemTypeAutofillCVC:
     case ItemTypeAutofillStatus: