Remove defunct members of WiFi class
After removing progressive scan, we don't use these anymore.
BUG=chromium:602716
TEST=make, unittests
Change-Id: I4648e9a8207187daa3b23f6db50dfff6e617911a
diff --git a/wifi/wifi.cc b/wifi/wifi.cc
index 6a5b642..a8577f5 100644
--- a/wifi/wifi.cc
+++ b/wifi/wifi.cc
@@ -175,12 +175,8 @@
scan_interval_seconds_(kDefaultScanIntervalSeconds),
scan_configuration_("Full scan"),
netlink_manager_(NetlinkManager::GetInstance()),
- min_frequencies_to_scan_(kMinumumFrequenciesToScan),
- max_frequencies_to_scan_(std::numeric_limits<int>::max()),
- scan_all_frequencies_(true),
random_mac_supported_(false),
random_mac_enabled_(false),
- fraction_per_scan_(kDefaultFractionPerScan),
scan_state_(kScanIdle),
scan_method_(kScanMethodNone),
receive_byte_count_at_connect_(0),
diff --git a/wifi/wifi.h b/wifi/wifi.h
index be45052..bde5fba 100644
--- a/wifi/wifi.h
+++ b/wifi/wifi.h
@@ -702,9 +702,6 @@
std::string scan_configuration_;
NetlinkManager* netlink_manager_;
std::set<uint16_t> all_scan_frequencies_;
- size_t min_frequencies_to_scan_;
- size_t max_frequencies_to_scan_;
- bool scan_all_frequencies_;
bool random_mac_supported_;
bool random_mac_enabled_;
@@ -713,12 +710,6 @@
// closure for processing the pending tasks in PendingScanResultsHandler().
std::unique_ptr<PendingScanResults> pending_scan_results_;
- // Fraction of previously seen scan frequencies to include in each
- // progressive scan batch (since the frequencies are sorted, the sum of the
- // fraction_per_scan_ over the scans in a session (* 100) is the percentile
- // of the frequencies that have been scanned).
- float fraction_per_scan_;
-
ScanState scan_state_;
ScanMethod scan_method_;
chromeos_metrics::Timer scan_timer_;
diff --git a/wifi/wifi_unittest.cc b/wifi/wifi_unittest.cc
index 6154531..9d032ab 100644
--- a/wifi/wifi_unittest.cc
+++ b/wifi/wifi_unittest.cc
@@ -698,11 +698,6 @@
return wifi_->all_scan_frequencies_.size();
}
- void SetScanSize(int min, int max) {
- wifi_->min_frequencies_to_scan_ = min;
- wifi_->max_frequencies_to_scan_ = max;
- }
-
void InstallMockWakeOnWiFi() {
wake_on_wifi_ = new MockWakeOnWiFi(&netlink_manager_, event_dispatcher_,
&metrics_);
