Move ParseConnection*() to connection_utils.
We don't need real_shill_provider if USE_DBUS is 0, but we still need
these functions, and they have a duplicate copy in connection_manager,
so put them in utils and deduplicate.
Also moved StringForConnectionType() to connection_utils.
Bug: 28800946
Test: mma
Change-Id: If535fdc52bc8fb267921bea02b31d8d6580d5d54
diff --git a/metrics_utils.cc b/metrics_utils.cc
index e165e89..263bacd 100644
--- a/metrics_utils.cc
+++ b/metrics_utils.cc
@@ -228,31 +228,31 @@
return metrics::DownloadErrorCode::kInputMalformed;
}
-metrics::ConnectionType GetConnectionType(NetworkConnectionType type,
- NetworkTethering tethering) {
+metrics::ConnectionType GetConnectionType(ConnectionType type,
+ ConnectionTethering tethering) {
switch (type) {
- case NetworkConnectionType::kUnknown:
+ case ConnectionType::kUnknown:
return metrics::ConnectionType::kUnknown;
- case NetworkConnectionType::kEthernet:
- if (tethering == NetworkTethering::kConfirmed)
+ case ConnectionType::kEthernet:
+ if (tethering == ConnectionTethering::kConfirmed)
return metrics::ConnectionType::kTetheredEthernet;
else
return metrics::ConnectionType::kEthernet;
- case NetworkConnectionType::kWifi:
- if (tethering == NetworkTethering::kConfirmed)
+ case ConnectionType::kWifi:
+ if (tethering == ConnectionTethering::kConfirmed)
return metrics::ConnectionType::kTetheredWifi;
else
return metrics::ConnectionType::kWifi;
- case NetworkConnectionType::kWimax:
+ case ConnectionType::kWimax:
return metrics::ConnectionType::kWimax;
- case NetworkConnectionType::kBluetooth:
+ case ConnectionType::kBluetooth:
return metrics::ConnectionType::kBluetooth;
- case NetworkConnectionType::kCellular:
+ case ConnectionType::kCellular:
return metrics::ConnectionType::kCellular;
}