Separate state of basic and advanced tab in CBD dialog

components/browsing_data/core/counters/browsing_data_counter.cc

 // 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.
 
 #include "components/browsing_data/core/counters/browsing_data_counter.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
 
 namespace browsing_data {
 
 BrowsingDataCounter::BrowsingDataCounter() {}
 
 BrowsingDataCounter::~BrowsingDataCounter() {}
 
 void BrowsingDataCounter::Init(PrefService* pref_service,
+                               ClearBrowsingDataPreferenceType pref_type,
                                const Callback& callback) {
   DCHECK(!initialized_);
   callback_ = callback;
-  pref_service_ = pref_service;
-  pref_.Init(GetPrefName(), pref_service_,
+  pref_type_ = pref_type;
+  pref_.Init(GetPrefName(), pref_service,
              base::Bind(&BrowsingDataCounter::Restart, base::Unretained(this)));
   period_.Init(
-      browsing_data::prefs::kDeleteTimePeriod, pref_service_,
+      GetTimePeriodPrefName(), pref_service,
       base::Bind(&BrowsingDataCounter::Restart, base::Unretained(this)));
 
   initialized_ = true;
   OnInitialized();
 }
 
 void BrowsingDataCounter::OnInitialized() {}
 
 base::Time BrowsingDataCounter::GetPeriodStart() {
   return CalculateBeginDeleteTime(static_cast<TimePeriod>(*period_));
 }
 
 void BrowsingDataCounter::Restart() {
   DCHECK(initialized_);
   callback_.Run(base::MakeUnique<Result>(this));
   Count();
 }
 
 void BrowsingDataCounter::ReportResult(ResultInt value) {
   DCHECK(initialized_);
   callback_.Run(base::MakeUnique<FinishedResult>(this, value));
 }
 
 void BrowsingDataCounter::ReportResult(std::unique_ptr<Result> result) {
   DCHECK(initialized_);
   callback_.Run(std::move(result));
 }
 
-PrefService* BrowsingDataCounter::GetPrefs() const {
-  return pref_service_;
+const char* BrowsingDataCounter::GetTimePeriodPrefName() const {
+  return GetPrefType() == ClearBrowsingDataPreferenceType::BASIC

[msramek, 2017/02/08 10:55:56]

This is already defined as
browsing_data::GetTimePeriodPreferenceName(ClearBrowsingDataPreferenceType) in
utils.h. We should call that here to make sure that the definitions don't
diverge.

[dullweber, 2017/02/08 23:03:19]

Thanks, I removed this method.

+             ? browsing_data::prefs::kDeleteTimePeriodBasic
+             : browsing_data::prefs::kDeleteTimePeriod;
+}
+
+ClearBrowsingDataPreferenceType BrowsingDataCounter::GetPrefType() const {
+  return pref_type_;
 }
 
 // BrowsingDataCounter::Result -------------------------------------------------
 
 BrowsingDataCounter::Result::Result(const BrowsingDataCounter* source)
     : source_(source) {}
 
 BrowsingDataCounter::Result::~Result() {}
 
 bool BrowsingDataCounter::Result::Finished() const {
@@ skipping 12 matching lines @@
 bool BrowsingDataCounter::FinishedResult::Finished() const {
   return true;
 }
 
 BrowsingDataCounter::ResultInt BrowsingDataCounter::FinishedResult::Value()
     const {
   return value_;
 }
 
 }  // namespace browsing_data