Revert "[iOS] Updates system colours to use google material colours"

This reverts commit 60e867a2.

Reason for revert: this CL breaks ios-simulator-noncq bot

Original change's description:
> [iOS] Updates system colours to use google material colours
>
> This CL replaces the existing system colours by Google material colours.
>
> Bug: 1155472
> Change-Id: Ia9c9e8f31d65fe1db70fd29ad94ca370d0aede07
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595050
> Reviewed-by: Gauthier Ambard <gambard@chromium.org>
> Reviewed-by: Javier Flores <javierrobles@chromium.org>
> Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#840999}

TBR=gambard@chromium.org,javierrobles@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,ewannpv@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1155472
Change-Id: Id0fc2b406f14f385366ed14d80fd704924c61aa8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617920Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841460}

ios/chrome/browser/ui/alert_view/alert_view_controller.mm

@@ -144,8 +144,7 @@ constexpr NSUInteger kUIViewAnimationCurveToOptionsShift = 16;
   self.contentView = [[UIView alloc] init];
   self.contentView.accessibilityIdentifier = self.alertAccessibilityIdentifier;
   self.contentView.clipsToBounds = YES;
-  self.contentView.backgroundColor =
-      [UIColor colorNamed:kPrimaryBackgroundColor];
+  self.contentView.backgroundColor = UIColor.cr_systemBackgroundColor;
   self.contentView.layer.cornerRadius = kCornerRadius;
   self.contentView.layer.shadowOffset =
       CGSizeMake(kShadowOffsetX, kShadowOffsetY);
@@ -295,8 +294,7 @@ constexpr NSUInteger kUIViewAnimationCurveToOptionsShift = 16;
     }
     stackHolder.layer.borderWidth = 1.0 / [UIScreen mainScreen].scale;
     stackHolder.clipsToBounds = YES;
-    stackHolder.backgroundColor =
-        [UIColor colorNamed:kSecondaryBackgroundColor];
+    stackHolder.backgroundColor = UIColor.cr_secondarySystemBackgroundColor;
     stackHolder.translatesAutoresizingMaskIntoConstraints = NO;
     self.textFieldStackHolder = stackHolder;
 

ios/chrome/browser/ui/authentication/signin/user_signin/gradient_view.mm

@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/authentication/signin/user_signin/gradient_view.h"
 
 #import "base/mac/foundation_util.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -53,9 +53,8 @@
   [CATransaction setDisableActions:YES];
 
   self.gradientLayer.colors = @[
-    (id)[[UIColor colorNamed:kPrimaryBackgroundColor] colorWithAlphaComponent:0]
-        .CGColor,
-    (id)[UIColor colorNamed:kPrimaryBackgroundColor].CGColor,
+    (id)[UIColor.cr_systemBackgroundColor colorWithAlphaComponent:0].CGColor,
+    (id)UIColor.cr_systemBackgroundColor.CGColor,
   ];
   [CATransaction commit];
 }

ios/chrome/browser/ui/authentication/signin/user_signin/user_signin_view_controller.mm

@@ -12,6 +12,7 @@
 #import "ios/chrome/browser/ui/authentication/signin/user_signin/gradient_view.h"
 #import "ios/chrome/browser/ui/util/rtl_geometry.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/common/ui/util/pointer_interaction_util.h"
@@ -306,7 +307,7 @@ enum AuthenticationButtonType {
 #pragma mark - Properties
 
 - (UIColor*)systemBackgroundColor {
-  return [UIColor colorNamed:kPrimaryBackgroundColor];
+  return UIColor.cr_systemBackgroundColor;
 }
 
 - (NSString*)confirmationButtonTitle {

ios/chrome/browser/ui/authentication/unified_consent/identity_picker_view.mm

@@ -12,7 +12,6 @@
 #import "ios/chrome/browser/ui/authentication/unified_consent/unified_consent_constants.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #import "ios/chrome/common/ui/util/pointer_interaction_util.h"
 
@@ -48,7 +47,7 @@ const CGFloat kArrowDownMargin = 12.;
   if (self) {
     self.accessibilityIdentifier = kIdentityPickerViewIdentifier;
     self.layer.cornerRadius = kIdentityPickerViewRadius;
-    self.backgroundColor = [UIColor colorNamed:kSecondaryBackgroundColor];
+    self.backgroundColor = UIColor.cr_secondarySystemBackgroundColor;
     // Adding view elements inside.
     // Ink view.
     _rippleView = [[MDCRippleView alloc] initWithFrame:CGRectZero];

ios/chrome/browser/ui/authentication/unified_consent/unified_consent_view_controller.mm

@@ -193,7 +193,7 @@ const char* const kSettingsSyncURL = "internal://settings-sync";
   // Separator.
   UIView* separator = [[UIView alloc] initWithFrame:CGRectZero];
   separator.translatesAutoresizingMaskIntoConstraints = NO;
-  separator.backgroundColor = [UIColor colorNamed:kSecondaryBackgroundColor];
+  separator.backgroundColor = UIColor.cr_secondarySystemBackgroundColor;
   [container addSubview:separator];
 
   // Customize label.

ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.mm

@@ -6,7 +6,7 @@
 
 #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -16,7 +16,7 @@
 
 - (void)viewDidLoad {
   [super viewDidLoad];
-  self.view.backgroundColor = [UIColor colorNamed:kPrimaryBackgroundColor];
+  self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
   self.navigationBar.accessibilityIdentifier = kBookmarkNavigationBarIdentifier;
 }
 

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

@@ -13,7 +13,7 @@
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/material_components/chrome_app_bar_view_controller.h"
 #import "ios/chrome/browser/ui/material_components/utils.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -65,10 +65,9 @@
   }
 
   // Suport dark mode.
-  self.collectionView.backgroundColor =
-      [UIColor colorNamed:kGroupedPrimaryBackgroundColor];
+  self.collectionView.backgroundColor = UIColor.cr_systemGroupedBackgroundColor;
   self.styler.cellBackgroundColor =
-      [UIColor colorNamed:kGroupedSecondaryBackgroundColor];
+      UIColor.cr_secondarySystemGroupedBackgroundColor;
 }
 
 - (void)contentSizeCategoryDidChange:(id)sender {

ios/chrome/browser/ui/fancy_ui/primary_action_button.mm

@@ -5,6 +5,7 @@
 #import "ios/chrome/browser/ui/fancy_ui/primary_action_button.h"
 
 #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/pointer_interaction_util.h"
 
@@ -42,7 +43,7 @@
   }
 #endif  // defined(__IPHONE_13_4)
 
-  UIColor* hintColor = [UIColor colorNamed:kPrimaryBackgroundColor];
+  UIColor* hintColor = UIColor.cr_systemBackgroundColor;
   UIColor* inkColor = [UIColor colorWithWhite:1 alpha:0.2f];
   UIColor* backgroundColor = [UIColor colorNamed:kBlueColor];
   UIColor* disabledColor = [UIColor colorNamed:kDisabledTintColor];

ios/chrome/browser/ui/first_run/static_file_view_controller.mm

@@ -13,7 +13,7 @@
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/material_components/utils.h"
 #include "ios/chrome/browser/ui/util/rtl_geometry.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/web/common/web_view_creation_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -70,7 +70,7 @@
                             cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
                         timeoutInterval:60.0];
   [_webView loadRequest:request];
-  [_webView setBackgroundColor:[UIColor colorNamed:kPrimaryBackgroundColor]];
+  [_webView setBackgroundColor:UIColor.cr_systemBackgroundColor];
   [self.view addSubview:_webView];
 
   ConfigureAppBarViewControllerWithCardStyle(_appBarViewController);

ios/chrome/browser/ui/material_components/utils.mm

@@ -15,7 +15,6 @@
 
 #include "base/mac/foundation_util.h"
 #import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -45,7 +44,7 @@ void ConfigureAppBarViewControllerWithCardStyle(
   viewController.headerView.shiftBehavior =
       MDCFlexibleHeaderShiftBehaviorDisabled;
   viewController.headerView.backgroundColor =
-      [UIColor colorNamed:kSecondaryBackgroundColor];
+      UIColor.cr_secondarySystemBackgroundColor;
   viewController.navigationBar.tintColor = UIColor.cr_labelColor;
   viewController.navigationBar.titleAlignment =
       MDCNavigationBarTitleAlignmentLeading;

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm

@@ -19,6 +19,7 @@
 #include "ios/chrome/browser/ui/table_view/cells/table_view_url_item.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -81,9 +82,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 - (void)viewDidLoad {
   [super viewDidLoad];
-  self.view.backgroundColor = [UIColor colorNamed:kPrimaryBackgroundColor];
-  self.styler.cellBackgroundColor =
-      [UIColor colorNamed:kPrimaryBackgroundColor];
+  self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
+  self.styler.cellBackgroundColor = UIColor.cr_systemBackgroundColor;
   self.tableView.sectionHeaderHeight = 0;
   self.tableView.sectionFooterHeight = 0;
   [self.tableView

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_view_controller.mm

@@ -16,6 +16,7 @@
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
 #import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
@@ -87,8 +88,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)viewDidLoad {
   [super viewDidLoad];
 
-  self.view.backgroundColor =
-      [UIColor colorNamed:kGroupedPrimaryBackgroundColor];
+  self.view.backgroundColor = UIColor.cr_systemGroupedBackgroundColor;
   self.tableView.accessibilityIdentifier = kAddCreditCardViewID;
 
   self.navigationItem.title = l10n_util::GetNSString(

ios/chrome/browser/ui/settings/clear_browsing_data/clear_browsing_data_table_view_controller.mm

@@ -139,10 +139,10 @@
 
   if (!base::FeatureList::IsEnabled(kSettingsRefresh)) {
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    self.styler.cellBackgroundColor = UIColor.cr_systemBackgroundColor;
+    self.styler.tableViewBackgroundColor = UIColor.cr_systemBackgroundColor;
     self.tableView.accessibilityIdentifier =
         kClearBrowsingDataViewAccessibilityIdentifier;
-    self.styler.tableViewBackgroundColor =
-        [UIColor colorNamed:kPrimaryBackgroundColor];
     self.tableView.backgroundColor = self.styler.tableViewBackgroundColor;
 
     // TableView configuration

ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller.mm

@@ -15,7 +15,6 @@
 #import "ios/chrome/browser/ui/table_view/table_view_utils.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
-#import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
@@ -79,8 +78,7 @@ static_assert(
 - (void)viewDidLoad {
   [super viewDidLoad];
   if (!base::FeatureList::IsEnabled(kSettingsRefresh)) {
-    self.styler.tableViewBackgroundColor =
-        [UIColor colorNamed:kPrimaryBackgroundColor];
+    self.styler.tableViewBackgroundColor = UIColor.cr_systemBackgroundColor;
     self.tableView.backgroundColor = self.styler.tableViewBackgroundColor;
   }
   [self loadModel];

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

@@ -25,6 +25,7 @@
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 #import "ios/chrome/common/ui/util/constraints_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
@@ -288,7 +289,7 @@ NSString* const kSettingsDoneButtonId = @"kSettingsDoneButtonId";
 - (void)viewDidLoad {
   [super viewDidLoad];
 
-  self.view.backgroundColor = [UIColor colorNamed:kPrimaryBackgroundColor];
+  self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
 
   if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
     self.navigationBar.translucent = NO;

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

@@ -117,7 +117,7 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
 - (void)viewDidLoad {
   if (!base::FeatureList::IsEnabled(kSettingsRefresh)) {
     self.styler.tableViewBackgroundColor =
-        [UIColor colorNamed:kGroupedPrimaryBackgroundColor];
+        UIColor.cr_systemGroupedBackgroundColor;
   }
   UIBarButtonItem* flexibleSpace = [[UIBarButtonItem alloc]
       initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
@@ -128,7 +128,7 @@ const CGFloat kActivityIndicatorDimensionIPhone = 56;
 
   [super viewDidLoad];
   self.styler.cellBackgroundColor =
-      [UIColor colorNamed:kGroupedSecondaryBackgroundColor];
+      UIColor.cr_secondarySystemGroupedBackgroundColor;
   self.styler.cellTitleColor = UIColor.cr_labelColor;
   self.tableView.estimatedSectionHeaderHeight = kEstimatedHeaderFooterHeight;
   self.tableView.estimatedRowHeight = kSettingsCellDefaultHeight;

ios/chrome/browser/ui/table_view/chrome_table_view_styler.mm

@@ -6,6 +6,7 @@
 
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -19,10 +20,9 @@
     if (base::FeatureList::IsEnabled(kSettingsRefresh)) {
       _tableViewBackgroundColor =
           [UIColor colorNamed:kSecondaryBackgroundColor];
-      _cellBackgroundColor =
-          [UIColor colorNamed:kGroupedSecondaryBackgroundColor];
+      _cellBackgroundColor = UIColor.cr_secondarySystemGroupedBackgroundColor;
     } else {
-      _tableViewBackgroundColor = [UIColor colorNamed:kPrimaryBackgroundColor];
+      _tableViewBackgroundColor = UIColor.cr_systemBackgroundColor;
     }
   }
   return self;

ios/chrome/browser/ui/table_view/table_view_navigation_controller.mm

@@ -8,6 +8,7 @@
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_controller.h"
 #import "ios/chrome/browser/ui/table_view/chrome_table_view_styler.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
+#import "ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h"
 #import "ios/chrome/common/ui/colors/semantic_color_names.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -42,10 +43,9 @@
     self.toolbar.barTintColor = [UIColor colorNamed:kSecondaryBackgroundColor];
     self.view.backgroundColor = [UIColor colorNamed:kSecondaryBackgroundColor];
   } else {
-    self.navigationBar.barTintColor =
-        [UIColor colorNamed:kPrimaryBackgroundColor];
-    self.toolbar.barTintColor = [UIColor colorNamed:kPrimaryBackgroundColor];
-    self.view.backgroundColor = [UIColor colorNamed:kPrimaryBackgroundColor];
+    self.navigationBar.barTintColor = UIColor.cr_systemBackgroundColor;
+    self.toolbar.barTintColor = UIColor.cr_systemBackgroundColor;
+    self.view.backgroundColor = UIColor.cr_systemBackgroundColor;
   }
 }
 

ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.h

@@ -13,6 +13,16 @@
 // TODO (crbug.com/981889): Remove along with iOS 12.
 @interface UIColor (CRSemanticColors)
 
+// System Background Color
+@property(class, nonatomic, readonly) UIColor* cr_systemBackgroundColor;
+@property(class, nonatomic, readonly)
+    UIColor* cr_secondarySystemBackgroundColor;
+
+// System Grouped Background Colors
+@property(class, nonatomic, readonly) UIColor* cr_systemGroupedBackgroundColor;
+@property(class, nonatomic, readonly)
+    UIColor* cr_secondarySystemGroupedBackgroundColor;
+
 // Label Colors
 @property(class, nonatomic, readonly) UIColor* cr_labelColor;
 @property(class, nonatomic, readonly) UIColor* cr_secondaryLabelColor;

ios/chrome/common/ui/colors/UIColor+cr_semantic_colors.mm

@@ -10,6 +10,42 @@
 
 @implementation UIColor (CRSemanticColors)
 
+#pragma mark - System Background Colors
+
++ (UIColor*)cr_systemBackgroundColor {
+  if (@available(iOS 13, *)) {
+    return UIColor.systemBackgroundColor;
+  }
+  return UIColor.whiteColor;
+}
+
++ (UIColor*)cr_secondarySystemBackgroundColor {
+  if (@available(iOS 13, *)) {
+    return UIColor.secondarySystemBackgroundColor;
+  }
+  // This is the value for secondarySystemBackgroundColor in light mode.
+  return [UIColor colorWithRed:244 / (CGFloat)0xFF
+                         green:244 / (CGFloat)0xFF
+                          blue:248 / (CGFloat)0xFF
+                         alpha:1];
+}
+
+#pragma mark - System Grouped Background Colors
+
++ (UIColor*)cr_systemGroupedBackgroundColor {
+  if (@available(iOS 13, *)) {
+    return UIColor.systemGroupedBackgroundColor;
+  }
+  return UIColor.groupTableViewBackgroundColor;
+}
+
++ (UIColor*)cr_secondarySystemGroupedBackgroundColor {
+  if (@available(iOS 13, *)) {
+    return UIColor.secondarySystemGroupedBackgroundColor;
+  }
+  return UIColor.whiteColor;
+}
+
 #pragma mark - Label Colors
 
 + (UIColor*)cr_labelColor {

ios/chrome/common/ui/colors/resources/BUILD.gn

@@ -27,12 +27,9 @@ group("resources") {
     ":grey_700_color",
     ":grey_800_color",
     ":grey_900_color",
-    ":grouped_primary_background_color",
-    ":grouped_secondary_background_color",
     ":mdc_ink_color",
     ":mdc_secondary_ink_color",
     ":placeholder_image_tint_color",
-    ":primary_background_color",
     ":red_color",
     ":red_dark_color",
     ":scrim_background_color",
@@ -226,15 +223,3 @@ colorset("toolbar_shadow_color") {
 colorset("secondary_background_color") {
   sources = [ "secondary_background_color.colorset/Contents.json" ]
 }
-
-colorset("primary_background_color") {
-  sources = [ "primary_background_color.colorset/Contents.json" ]
-}
-
-colorset("grouped_secondary_background_color") {
-  sources = [ "grouped_secondary_background_color.colorset/Contents.json" ]
-}
-
-colorset("grouped_primary_background_color") {
-  sources = [ "grouped_primary_background_color.colorset/Contents.json" ]
-}

ios/chrome/common/ui/colors/resources/grouped_primary_background_color.colorset/Contents.json

-{
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  },
-  "colors": [
-    {
-      "idiom": "universal",
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0xF1",
-          "alpha": "1.000",
-          "blue": "0xF4",
-          "green": "0xF3"
-        }
-      }
-    },
-    {
-      "idiom": "universal",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0x20",
-          "alpha": "1.000",
-          "blue": "0x24",
-          "green": "0x21"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file

ios/chrome/common/ui/colors/resources/grouped_secondary_background_color.colorset/Contents.json

-{
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  },
-  "colors": [
-    {
-      "idiom": "universal",
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0xFF",
-          "alpha": "1.000",
-          "blue": "0xFF",
-          "green": "0xFF"
-        }
-      }
-    },
-    {
-      "idiom": "universal",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0x35",
-          "alpha": "1.000",
-          "blue": "0x39",
-          "green": "0x37"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file

ios/chrome/common/ui/colors/resources/primary_background_color.colorset/Contents.json

-{
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  },
-  "colors": [
-    {
-      "idiom": "universal",
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0xFF",
-          "alpha": "1.000",
-          "blue": "0xFF",
-          "green": "0xFF"
-        }
-      }
-    },
-    {
-      "idiom": "universal",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "color": {
-        "color-space": "display-p3",
-        "components": {
-          "red": "0x20",
-          "alpha": "1.000",
-          "blue": "0x24",
-          "green": "0x21"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file

ios/chrome/common/ui/colors/semantic_color_names.h

@@ -14,10 +14,6 @@ extern NSString* const kCloseButtonColor;
 extern NSString* const kDisabledTintColor;
 // Background color used in the rounded squares behind favicons.
 extern NSString* const kFaviconBackgroundColor;
-// Primary grouped background color.
-extern NSString* const kGroupedPrimaryBackgroundColor;
-// Secondary grouped background color.
-extern NSString* const kGroupedSecondaryBackgroundColor;
 // Ink color for an MDC button.
 extern NSString* const kMDCInkColor;
 // Ink color for a secondary style MDC button (button with transparent
@@ -25,8 +21,6 @@ extern NSString* const kMDCInkColor;
 extern NSString* const kMDCSecondaryInkColor;
 // Color used to tint placeholder images and icons.
 extern NSString* const kPlaceholderImageTintColor;
-// Primary background color.
-extern NSString* const kPrimaryBackgroundColor;
 extern NSString* const kScrimBackgroundColor;
 // Secondary background color.
 extern NSString* const kSecondaryBackgroundColor;

ios/chrome/common/ui/colors/semantic_color_names.mm

@@ -13,14 +13,9 @@ NSString* const kBackgroundColor = @"background_color";
 NSString* const kCloseButtonColor = @"close_button_color";
 NSString* const kDisabledTintColor = @"disabled_tint_color";
 NSString* const kFaviconBackgroundColor = @"favicon_background_color";
-NSString* const kGroupedPrimaryBackgroundColor =
-    @"grouped_primary_background_color";
-NSString* const kGroupedSecondaryBackgroundColor =
-    @"grouped_secondary_background_color";
 NSString* const kMDCInkColor = @"mdc_ink_color";
 NSString* const kMDCSecondaryInkColor = @"mdc_secondary_ink_color";
 NSString* const kPlaceholderImageTintColor = @"placeholder_image_tint_color";
-NSString* const kPrimaryBackgroundColor = @"primary_background_color";
 NSString* const kScrimBackgroundColor = @"scrim_background_color";
 NSString* const kSecondaryBackgroundColor = @"secondary_background_color";
 NSString* const kSeparatorColor = @"separator_color";