Commit 06867151 authored by Hugo Benichi's avatar Hugo Benichi Committed by Commit Bot

arc: net: remove usage of kTetheringProperty

This was migrated to kMeteredProperty in Change-Id
I83f4ca01521947edb39785053308cb88b658a69e.

BUG=b:156302252
TEST=Compiled.

Change-Id: If6ad3879d96232b640e5f13cf2b8981cd4031eb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2217683Reviewed-by: default avatarYusuke Sato <yusukes@chromium.org>
Commit-Queue: Hugo Benichi <hugobenichi@google.com>
Cr-Commit-Position: refs/heads/master@{#773990}
parent a9a94e16
...@@ -82,18 +82,6 @@ arc::mojom::SecurityType TranslateWiFiSecurity(const std::string& type) { ...@@ -82,18 +82,6 @@ arc::mojom::SecurityType TranslateWiFiSecurity(const std::string& type) {
return arc::mojom::SecurityType::NONE; return arc::mojom::SecurityType::NONE;
} }
arc::mojom::TetheringClientState TranslateTetheringState(
const std::string& tethering_state) {
if (tethering_state == shill::kTetheringConfirmedState)
return arc::mojom::TetheringClientState::CONFIRMED;
if (tethering_state == shill::kTetheringNotDetectedState)
return arc::mojom::TetheringClientState::NOT_DETECTED;
if (tethering_state == shill::kTetheringSuspectedState)
return arc::mojom::TetheringClientState::SUSPECTED;
NOTREACHED() << "Invalid tethering state: " << tethering_state;
return arc::mojom::TetheringClientState::NOT_DETECTED;
}
// Translates a shill connection state into a mojo ConnectionStateType. // Translates a shill connection state into a mojo ConnectionStateType.
// This is effectively the inverse function of shill.Service::GetStateString // This is effectively the inverse function of shill.Service::GetStateString
// defined in platform2/shill/service.cc, with in addition some of shill's // defined in platform2/shill/service.cc, with in addition some of shill's
...@@ -231,9 +219,6 @@ arc::mojom::NetworkConfigurationPtr TranslateNetworkProperties( ...@@ -231,9 +219,6 @@ arc::mojom::NetworkConfigurationPtr TranslateNetworkProperties(
mojo->is_metered = mojo->is_metered =
shill_dict && shill_dict &&
shill_dict->FindBoolPath(shill::kMeteredProperty).value_or(false); shill_dict->FindBoolPath(shill::kMeteredProperty).value_or(false);
// TODO(b/156302252) Remove once ARC side has been migrated to |is_metered|.
mojo->deprecated_tethering_client_state =
TranslateTetheringState(network_state->tethering_state());
// IP configuration data is added from the properties of the underlying shill // IP configuration data is added from the properties of the underlying shill
// Device and shill Service attached to the Device. Device properties are // Device and shill Service attached to the Device. Device properties are
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment