Separate state of basic and advanced tab in CBD dialog

ios/chrome/browser/ui/settings/time_range_selector_collection_view_controller.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/settings/time_range_selector_collection_view_controller.h"
 
 #import "base/ios/weak_nsobject.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "components/browsing_data/core/pref_names.h"
@@ skipping 19 matching lines @@
   ItemTypeBeginningOfTime,
 };
 
 const int kStringIDS[] = {
     IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_PAST_HOUR,
     IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_PAST_DAY,
     IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_PAST_WEEK,
     IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_LAST_FOUR_WEEKS,
     IDS_IOS_CLEAR_BROWSING_DATA_TIME_RANGE_OPTION_BEGINNING_OF_TIME};
 
-static_assert(arraysize(kStringIDS) == browsing_data::TIME_PERIOD_LAST + 1,
-              "Strings have to match the enum values.");
+static_assert(
+    arraysize(kStringIDS) ==
+        static_cast<int>(browsing_data::TimePeriod::TIME_PERIOD_LAST) + 1,
+    "Strings have to match the enum values.");
 
 }  // namespace
 
 @interface TimeRangeSelectorCollectionViewController () {
   // Instance of the parent view controller needed in order to set the time
   // range for the browsing data deletion.
   base::WeakNSProtocol<id<TimeRangeSelectorCollectionViewControllerDelegate>>
       _weakDelegate;
   IntegerPrefMember timeRangePref_;
 }
@@ skipping 91 matching lines @@
 }
 
 #pragma mark - UICollectionViewDelegate
 
 - (void)collectionView:(UICollectionView*)collectionView
     didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
   [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
   NSInteger itemType =
       [self.collectionViewModel itemTypeForIndexPath:indexPath];
   int timePeriod = itemType - kItemTypeEnumZero;
-  DCHECK_LE(timePeriod, browsing_data::TIME_PERIOD_LAST);
+  DCHECK_LE(timePeriod,
+            static_cast<int>(browsing_data::TimePeriod::TIME_PERIOD_LAST));
   [self updatePrefValue:timePeriod];
   [_weakDelegate
       timeRangeSelectorViewController:self
                   didSelectTimePeriod:static_cast<browsing_data::TimePeriod>(
                                           timePeriod)];
 }
 
 #pragma mark - Class methods
 
 + (NSString*)timePeriodLabelForPrefs:(PrefService*)prefs {
   if (!prefs)
     return nil;
   int prefValue = prefs->GetInteger(browsing_data::prefs::kDeleteTimePeriod);
   if (prefValue < 0 || static_cast<size_t>(prefValue) >= arraysize(kStringIDS))
     return nil;
   return l10n_util::GetNSString(kStringIDS[prefValue]);
 }
 
 @end