Remove the the TechnologyIs method from Device, associated classes, and everything else.
BUG=chromium-os:29696
TEST=Ran unit tests.
Change-Id: I581f1b0062a2a171705bc3a72e72f13d2157bf24
Reviewed-on: https://gerrit.chromium.org/gerrit/24538
Commit-Ready: Joshua Kroll <joshkroll@chromium.org>
Tested-by: Joshua Kroll <joshkroll@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
diff --git a/device_info.cc b/device_info.cc
index d4d5f27..4c0a746 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -118,10 +118,10 @@
<< device->interface_index() << ")";
CHECK(!GetDevice(device->interface_index()).get());
infos_[device->interface_index()].device = device;
- if (device->TechnologyIs(Technology::kCellular) ||
- device->TechnologyIs(Technology::kEthernet) ||
- device->TechnologyIs(Technology::kWifi) ||
- device->TechnologyIs(Technology::kWiMax)) {
+ if ((device->technology() == Technology::kCellular) ||
+ (device->technology() == Technology::kEthernet) ||
+ (device->technology() == Technology::kWifi) ||
+ (device->technology() == Technology::kWiMax)) {
manager_->RegisterDevice(device);
}
}
@@ -131,8 +131,8 @@
SLOG(Device, 2) << __func__ << "(" << device->link_name() << ", "
<< interface_index << ")";
- CHECK(device->TechnologyIs(Technology::kCellular) ||
- device->TechnologyIs(Technology::kWiMax));
+ CHECK((device->technology() == Technology::kCellular) ||
+ (device->technology() == Technology::kWiMax));
// Release reference to the device
map<int, Info>::iterator iter = infos_.find(interface_index);