Separate state of basic and advanced tab in CBD dialog

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

 // Copyright 2015 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/clear_browsing_data_collection_view_controller.h"
 
 #include <memory>
 #include <string>
 
 #include "base/ios/ios_util.h"
@@ skipping 174 matching lines @@
   DCHECK(browserState);
   self = [super initWithStyle:CollectionViewControllerStyleAppBar];
   if (self) {
     self.accessibilityTraits |= UIAccessibilityTraitButton;
 
     _browserState = browserState;
     if (experimental_flags::IsNewClearBrowsingDataUIEnabled()) {
       int prefValue = browserState->GetPrefs()->GetInteger(
           browsing_data::prefs::kDeleteTimePeriod);
       prefValue = MAX(0, prefValue);
-      if (prefValue > browsing_data::TIME_PERIOD_LAST) {
-        prefValue = browsing_data::TIME_PERIOD_LAST;
+      const int maxValue =
+          static_cast<int>(browsing_data::TimePeriod::TIME_PERIOD_LAST);
+      if (prefValue > maxValue) {
+        prefValue = maxValue;
       }
       _timePeriod = static_cast<browsing_data::TimePeriod>(prefValue);
     } else {
-      _timePeriod = browsing_data::ALL_TIME;
+      _timePeriod = browsing_data::TimePeriod::ALL_TIME;
     }
 
     self.title = l10n_util::GetNSString(IDS_IOS_CLEAR_BROWSING_DATA_TITLE);
     self.collectionViewAccessibilityIdentifier =
         kClearBrowsingDataCollectionViewId;
 
     if (experimental_flags::IsNewClearBrowsingDataUIEnabled()) {
       base::WeakNSObject<ClearBrowsingDataCollectionViewController> weakSelf(
           self);
       void (^dataClearedCallback)(
@@ skipping 585 matching lines @@
     // Because of this, the lowest unit that can be used is MB.
     static const int kBytesInAMegabyte = 1 << 20;
     if (cacheSizeBytes >= kBytesInAMegabyte) {
       base::scoped_nsobject<NSByteCountFormatter> formatter(
           [[NSByteCountFormatter alloc] init]);
       formatter.get().allowedUnits = NSByteCountFormatterUseAll &
                                      (~NSByteCountFormatterUseBytes) &
                                      (~NSByteCountFormatterUseKB);
       formatter.get().countStyle = NSByteCountFormatterCountStyleMemory;
       NSString* formattedSize = [formatter stringFromByteCount:cacheSizeBytes];
-      return (_timePeriod == browsing_data::ALL_TIME)
+      return (_timePeriod == browsing_data::TimePeriod::ALL_TIME)
                  ? formattedSize
                  : l10n_util::GetNSStringF(
                        IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE,
                        base::SysNSStringToUTF16(formattedSize));
     }
     return l10n_util::GetNSString(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
   }
   return base::SysUTF16ToNSString(
       browsing_data::GetCounterTextFromResult(&result));
 }
@@ skipping 74 matching lines @@
 
 #pragma mark TimeRangeSelectorCollectionViewControllerDelegate
 
 - (void)timeRangeSelectorViewController:
             (TimeRangeSelectorCollectionViewController*)collectionViewController
                     didSelectTimePeriod:(browsing_data::TimePeriod)timePeriod {
   _timePeriod = timePeriod;
 }
 
 @end