| Index: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| index 0e329e57d764d6c73249465d53771d95dbe0a68c..6d342344a8f0b4adf449c19d692a222baacf1f68 100644
|
| --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
|
| @@ -144,11 +144,10 @@ bool BrowsingDataSettingsFunction::RunSync() {
|
|
|
| // Fill deletion time period.
|
| int period_pref = prefs->GetInteger(prefs::kDeleteTimePeriod);
|
| - BrowsingDataRemover::TimePeriod period =
|
| - static_cast<BrowsingDataRemover::TimePeriod>(period_pref);
|
| + TimePeriod period = static_cast<TimePeriod>(period_pref);
|
| double since = 0;
|
| - if (period != BrowsingDataRemover::EVERYTHING) {
|
| - base::Time time = BrowsingDataRemover::CalculateBeginDeleteTime(period);
|
| + if (period != EVERYTHING) {
|
| + base::Time time = CalculateBeginDeleteTime(period);
|
| since = time.ToJsTime();
|
| }
|
|
|
| @@ -328,9 +327,8 @@ void BrowsingDataRemoverFunction::StartRemoving() {
|
| // we've generated above. We can use a raw pointer here, as the browsing data
|
| // remover is responsible for deleting itself once data removal is complete.
|
| observer_.Add(remover);
|
| - remover->Remove(
|
| - BrowsingDataRemover::TimeRange(remove_since_, base::Time::Max()),
|
| - removal_mask_, origin_type_mask_);
|
| + remover->Remove(TimeRange(remove_since_, base::Time::Max()), removal_mask_,
|
| + origin_type_mask_);
|
| }
|
|
|
| int BrowsingDataRemoverFunction::ParseOriginTypeMask(
|
|
|