shill: Disable RTTI

There is no longer a reliance on RTTI in libbrillo, so disable RTTI
in the rest of Brillo codebase.

Shill also used dynamic_cast<> in many places but it looks like there
is no reason for that. Using static_cast<> in those places seems to
work just as well and doesn't require RTTI.

Bug: 26292405, chromium:220387
TEST: Compiles, all unit tests pass on Dragonboard
      Was able to bootstrap a device from scratch and networking
      seems to work fine.

Change-Id: Id0c47168e634e354b4279f613246e6667df6fb5f

27 files changed, 64 insertions, 62 deletions

diff --git a/Android.mk b/Android.mk
index 968185e9..f3dd4597 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,6 @@ LOCAL_PATH := $(call my-dir)
 define shill_cpp_common
   LOCAL_CPP_EXTENSION := .cc
   LOCAL_CLANG := true
-  LOCAL_RTTI_FLAG := -frtti
   LOCAL_CFLAGS := \
       -Wextra \
       -Werror \
@@ -331,7 +330,7 @@ LOCAL_SHARED_LIBRARIES := \
     libchrome-dbus \
     libshill-net \
     libmetrics \
-    libprotobuf-cpp-lite-rtti
+    libprotobuf-cpp-lite
 ifdef BRILLO
 LOCAL_SHARED_LIBRARIES += libhardware
 LOCAL_REQUIRED_MODULES := $(WIFI_DRIVER_HAL_MODULE)
@@ -361,7 +360,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbrillo-minijail \
     libbrillo-dbus \
     libchrome-dbus \
-    libprotobuf-cpp-lite-rtti
+    libprotobuf-cpp-lite
 LOCAL_STATIC_LIBRARIES := libshill libgmock libchrome_test_helpers
 proto_header_dir := $(call local-generated-sources-dir)/proto/$(shill_parent_dir)
 LOCAL_C_INCLUDES := \
diff --git a/NETLINK_MESSAGES.txt b/NETLINK_MESSAGES.txt
index 89b0b54a..f876c436 100644
--- a/NETLINK_MESSAGES.txt
+++ b/NETLINK_MESSAGES.txt
@@ -167,7 +167,7 @@ Make some sort of handler for the response message.
               break;
             }
             const ErrorAckMessage* error_ack_message =
-                dynamic_cast<const ErrorAckMessage*>(netlink_message);
+                static_cast<const ErrorAckMessage*>(netlink_message);
             if (error_ack_message->error()) {
               LOG(ERROR) << __func__ << ": Message failed: "
                          << error_ack_message->ToString();
diff --git a/cellular/cellular_capability_cdma_unittest.cc b/cellular/cellular_capability_cdma_unittest.cc
index 5e16ff23..2bb3969c 100644
--- a/cellular/cellular_capability_cdma_unittest.cc
+++ b/cellular/cellular_capability_cdma_unittest.cc
@@ -71,7 +71,7 @@ class CellularCapabilityCDMATest : public testing::Test {
 
   virtual void SetUp() {
     capability_ =
-        dynamic_cast<CellularCapabilityCDMA*>(cellular_->capability_.get());
+        static_cast<CellularCapabilityCDMA*>(cellular_->capability_.get());
   }
 
   void InvokeActivate(const string& carrier, Error* error,
diff --git a/cellular/cellular_capability_classic_unittest.cc b/cellular/cellular_capability_classic_unittest.cc
index c71245ea..21f6baed 100644
--- a/cellular/cellular_capability_classic_unittest.cc
+++ b/cellular/cellular_capability_classic_unittest.cc
@@ -84,10 +84,10 @@ class CellularCapabilityTest : public testing::Test {
   virtual void SetUp() {
     static_cast<Device*>(cellular_.get())->rtnl_handler_ = &rtnl_handler_;
 
-    capability_ = dynamic_cast<CellularCapabilityClassic*>(
+    capability_ = static_cast<CellularCapabilityClassic*>(
         cellular_->capability_.get());
     device_adaptor_ =
-        dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
+        static_cast<DeviceMockAdaptor*>(cellular_->adaptor());
     ASSERT_NE(nullptr, device_adaptor_);;
   }
 
@@ -119,7 +119,7 @@ class CellularCapabilityTest : public testing::Test {
   }
 
   CellularCapabilityGSM* GetGsmCapability() {
-    return dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+    return static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
   }
 
   void ReleaseCapabilityProxies() {
@@ -227,13 +227,13 @@ class CellularCapabilityTest : public testing::Test {
 
   void SetGSMNetworkProxy() {
     CellularCapabilityGSM* gsm_capability =
-        dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+        static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
     gsm_capability->network_proxy_.reset(gsm_network_proxy_.release());
   }
 
   void SetCellularType(Cellular::Type type) {
     cellular_->InitCapability(type);
-    capability_ = dynamic_cast<CellularCapabilityClassic*>(
+    capability_ = static_cast<CellularCapabilityClassic*>(
         cellular_->capability_.get());
   }
 
@@ -347,7 +347,7 @@ TEST_F(CellularCapabilityTest, AllowRoaming) {
   }
 
   cellular_->state_ = Cellular::kStateConnected;
-  dynamic_cast<CellularCapabilityGSM*>(capability_)->registration_state_ =
+  static_cast<CellularCapabilityGSM*>(capability_)->registration_state_ =
       MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING;
   cellular_->SetAllowRoaming(true, nullptr);
   EXPECT_TRUE(cellular_->GetAllowRoaming(nullptr));
diff --git a/cellular/cellular_capability_gsm_unittest.cc b/cellular/cellular_capability_gsm_unittest.cc
index 8e9b167b..c64dab42 100644
--- a/cellular/cellular_capability_gsm_unittest.cc
+++ b/cellular/cellular_capability_gsm_unittest.cc
@@ -90,9 +90,9 @@ class CellularCapabilityGSMTest : public testing::Test {
 
   virtual void SetUp() {
     capability_ =
-        dynamic_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+        static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
     device_adaptor_ =
-        dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
+        static_cast<DeviceMockAdaptor*>(cellular_->adaptor());
   }
 
   void InvokeEnable(bool enable, Error* error,
diff --git a/cellular/cellular_capability_universal_cdma_unittest.cc b/cellular/cellular_capability_universal_cdma_unittest.cc
index c8f52f9c..c2cb9848 100644
--- a/cellular/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular/cellular_capability_universal_cdma_unittest.cc
@@ -92,10 +92,10 @@ class CellularCapabilityUniversalCDMATest : public testing::Test {
   }
 
   virtual void SetUp() {
-    capability_ = dynamic_cast<CellularCapabilityUniversalCDMA*>(
+    capability_ = static_cast<CellularCapabilityUniversalCDMA*>(
         cellular_->capability_.get());
     device_adaptor_ =
-        dynamic_cast<NiceMock<DeviceMockAdaptor>*>(cellular_->adaptor());
+        static_cast<NiceMock<DeviceMockAdaptor>*>(cellular_->adaptor());
     cellular_->service_ = service_;
   }
 
diff --git a/cellular/cellular_capability_universal_unittest.cc b/cellular/cellular_capability_universal_unittest.cc
index 575ee1a0..c67193f5 100644
--- a/cellular/cellular_capability_universal_unittest.cc
+++ b/cellular/cellular_capability_universal_unittest.cc
@@ -112,10 +112,10 @@ class CellularCapabilityUniversalTest : public testing::TestWithParam<string> {
   }
 
   virtual void SetUp() {
-    capability_ = dynamic_cast<CellularCapabilityUniversal*>(
+    capability_ = static_cast<CellularCapabilityUniversal*>(
         cellular_->capability_.get());
     device_adaptor_ =
-        dynamic_cast<DeviceMockAdaptor*>(cellular_->adaptor());
+        static_cast<DeviceMockAdaptor*>(cellular_->adaptor());
     cellular_->service_ = service_;
 
     // kStateUnknown leads to minimal extra work in maintaining
diff --git a/cellular/cellular_service_unittest.cc b/cellular/cellular_service_unittest.cc
index d0f68aac..4521a66a 100644
--- a/cellular/cellular_service_unittest.cc
+++ b/cellular/cellular_service_unittest.cc
@@ -67,7 +67,7 @@ class CellularServiceTest : public testing::Test {
 
   virtual void SetUp() {
     adaptor_ =
-        dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+        static_cast<ServiceMockAdaptor*>(service_->adaptor());
     out_of_credits_detector_ =
         new MockOutOfCreditsDetector(nullptr, nullptr, nullptr, service_.get());
     // Passes ownership.
@@ -75,7 +75,7 @@ class CellularServiceTest : public testing::Test {
   }
 
   CellularCapabilityCDMA* GetCapabilityCDMA() {
-    return dynamic_cast<CellularCapabilityCDMA*>(device_->capability_.get());
+    return static_cast<CellularCapabilityCDMA*>(device_->capability_.get());
   }
 
  protected:
diff --git a/cellular/cellular_unittest.cc b/cellular/cellular_unittest.cc
index 69d94bb9..328ef353 100644
--- a/cellular/cellular_unittest.cc
+++ b/cellular/cellular_unittest.cc
@@ -391,7 +391,7 @@ class CellularTest : public testing::Test {
 
   void ExpectPPPStopped() {
     auto mock_ppp_device =
-        dynamic_cast<MockPPPDevice*>(device_->ppp_device_.get());
+        static_cast<MockPPPDevice*>(device_->ppp_device_.get());
     EXPECT_CALL(*mock_ppp_device, DropConnection());
   }
 
@@ -408,7 +408,7 @@ class CellularTest : public testing::Test {
         .Times(AnyNumber());
     EXPECT_CALL(*modem_info_.mock_manager(), UpdateEnabledTechnologies())
         .Times(AnyNumber());
-    EXPECT_CALL(*dynamic_cast<DeviceMockAdaptor*>(device_->adaptor()),
+    EXPECT_CALL(*static_cast<DeviceMockAdaptor*>(device_->adaptor()),
                 EmitBoolChanged(_, _)).Times(AnyNumber());
   }
 
@@ -562,20 +562,20 @@ class CellularTest : public testing::Test {
   }
 
   CellularCapabilityClassic* GetCapabilityClassic() {
-    return dynamic_cast<CellularCapabilityClassic*>(
+    return static_cast<CellularCapabilityClassic*>(
         device_->capability_.get());
   }
 
   CellularCapabilityCDMA* GetCapabilityCDMA() {
-    return dynamic_cast<CellularCapabilityCDMA*>(device_->capability_.get());
+    return static_cast<CellularCapabilityCDMA*>(device_->capability_.get());
   }
 
   CellularCapabilityGSM* GetCapabilityGSM() {
-    return dynamic_cast<CellularCapabilityGSM*>(device_->capability_.get());
+    return static_cast<CellularCapabilityGSM*>(device_->capability_.get());
   }
 
   CellularCapabilityUniversal* GetCapabilityUniversal() {
-    return dynamic_cast<CellularCapabilityUniversal*>(
+    return static_cast<CellularCapabilityUniversal*>(
         device_->capability_.get());
   }
 
diff --git a/device_unittest.cc b/device_unittest.cc
index fcb75782..33fc8def 100644
--- a/device_unittest.cc
+++ b/device_unittest.cc
@@ -256,7 +256,7 @@ class DeviceTest : public PropertyStoreTest {
   }
 
   DeviceMockAdaptor* GetDeviceMockAdaptor() {
-    return dynamic_cast<DeviceMockAdaptor*>(device_->adaptor_.get());
+    return static_cast<DeviceMockAdaptor*>(device_->adaptor_.get());
   }
 
   void SetManager(Manager* manager) {
diff --git a/ethernet/ethernet_eap_service_unittest.cc b/ethernet/ethernet_eap_service_unittest.cc
index bfa71251..d0725b5e 100644
--- a/ethernet/ethernet_eap_service_unittest.cc
+++ b/ethernet/ethernet_eap_service_unittest.cc
@@ -50,7 +50,7 @@ class EthernetEapServiceTest : public testing::Test {
 
  protected:
   ServiceMockAdaptor* GetAdaptor() {
-    return dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service_->adaptor());
   }
 
   MockControl control_;
diff --git a/ethernet/ethernet_service_unittest.cc b/ethernet/ethernet_service_unittest.cc
index 66708937..844d19a7 100644
--- a/ethernet/ethernet_service_unittest.cc
+++ b/ethernet/ethernet_service_unittest.cc
@@ -65,7 +65,7 @@ class EthernetServiceTest : public PropertyStoreTest {
   }
 
   ServiceMockAdaptor* GetAdaptor() {
-    return dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service_->adaptor());
   }
 
   MockManager mock_manager_;
diff --git a/ipconfig_unittest.cc b/ipconfig_unittest.cc
index 9df6487d..ad285337 100644
--- a/ipconfig_unittest.cc
+++ b/ipconfig_unittest.cc
@@ -85,7 +85,7 @@ class IPConfigTest : public Test {
 
  protected:
   IPConfigMockAdaptor* GetAdaptor() {
-    return dynamic_cast<IPConfigMockAdaptor*>(ipconfig_->adaptor_.get());
+    return static_cast<IPConfigMockAdaptor*>(ipconfig_->adaptor_.get());
   }
 
   void UpdateProperties(const IPConfig::Properties& properties) {
diff --git a/manager_unittest.cc b/manager_unittest.cc
index 447e40e5..828943fd 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -672,7 +672,7 @@ TEST_F(ManagerTest, ServiceRegistration) {
   EXPECT_CALL(*mock_service2.get(), GetRpcIdentifier())
       .WillRepeatedly(Return(service2_name));
   // TODO(quiche): make this EXPECT_CALL work (crbug.com/203247)
-  // EXPECT_CALL(*dynamic_cast<ManagerMockAdaptor*>(manager.adaptor_.get()),
+  // EXPECT_CALL(*static_cast<ManagerMockAdaptor*>(manager.adaptor_.get()),
   //             EmitRpcIdentifierArrayChanged(kServicesProperty, _));
 
   manager.RegisterService(mock_service);
diff --git a/net/netlink_manager.cc b/net/netlink_manager.cc
index d32c44e8..bceb8a40 100644
--- a/net/netlink_manager.cc
+++ b/net/netlink_manager.cc
@@ -114,7 +114,7 @@ class ControlResponseHandler : public NetlinkManager::NetlinkResponseHandler {
     }
     if (!handler_.is_null()) {
       const ControlNetlinkMessage* message =
-          dynamic_cast<const ControlNetlinkMessage*>(&netlink_message);
+          static_cast<const ControlNetlinkMessage*>(&netlink_message);
       handler_.Run(*message);
     }
     return true;
@@ -155,7 +155,7 @@ class Nl80211ResponseHandler : public NetlinkManager::NetlinkResponseHandler {
     }
     if (!handler_.is_null()) {
       const Nl80211Message* message =
-          dynamic_cast<const Nl80211Message*>(&netlink_message);
+          static_cast<const Nl80211Message*>(&netlink_message);
       handler_.Run(*message);
     }
     return true;
@@ -270,7 +270,7 @@ void NetlinkManager::OnNetlinkMessageError(AuxilliaryMessageType type,
       }
       if (raw_message->message_type() == ErrorAckMessage::GetMessageType()) {
         const ErrorAckMessage* error_ack_message =
-            dynamic_cast<const ErrorAckMessage*>(raw_message);
+            static_cast<const ErrorAckMessage*>(raw_message);
         // error_ack_message->error() should be non-zero (i.e. not an ACK),
         // since ACKs would be routed to a NetlinkAckHandler in
         // NetlinkManager::OnNlMessageReceived.
@@ -699,7 +699,7 @@ void NetlinkManager::OnNlMessageReceived(NetlinkPacket* packet) {
   if (message->message_type() == ErrorAckMessage::GetMessageType()) {
     is_error_ack_message = true;
     const ErrorAckMessage* error_ack_message =
-        dynamic_cast<const ErrorAckMessage*>(message.get());
+        static_cast<const ErrorAckMessage*>(message.get());
     error_code = error_ack_message->error();
   }
 
diff --git a/net/netlink_message_matchers.h b/net/netlink_message_matchers.h
index cee9f82a..aafd27dd 100644
--- a/net/netlink_message_matchers.h
+++ b/net/netlink_message_matchers.h
@@ -36,7 +36,7 @@ MATCHER_P2(IsNl80211Command, nl80211_message_type, command, "") {
     LOG(INFO) << "Not an nl80211 message";
     return false;
   }
-  const Nl80211Message* msg = dynamic_cast<const Nl80211Message*>(arg);
+  const Nl80211Message* msg = static_cast<const Nl80211Message*>(arg);
   if (msg->command() != command) {
     LOG(INFO) << "Not a message of type " << command
                << " (it's a " << +msg->command() << ")";
@@ -52,7 +52,7 @@ MATCHER(IsDisableWakeOnWiFiMsg, "") {
     LOG(INFO) << "Null message";
     return false;
   }
-  const Nl80211Message* msg = dynamic_cast<const Nl80211Message*>(arg);
+  const Nl80211Message* msg = static_cast<const Nl80211Message*>(arg);
   if (msg->command() != NL80211_CMD_SET_WOWLAN) {
     LOG(INFO) << "Not a NL80211_CMD_SET_WOWLAN message";
     return false;
diff --git a/net/netlink_message_unittest.cc b/net/netlink_message_unittest.cc
index 4d1f9bde..aca8dca9 100644
--- a/net/netlink_message_unittest.cc
+++ b/net/netlink_message_unittest.cc
@@ -453,7 +453,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_TRIGGER_SCAN) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
 
   EXPECT_EQ(NL80211_CMD_TRIGGER_SCAN, message->command());
@@ -506,7 +506,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_NEW_SCAN_RESULTS) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
 
   EXPECT_EQ(NL80211_CMD_NEW_SCAN_RESULTS, message->command());
@@ -559,7 +559,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_NEW_STATION) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_NEW_STATION, message->command());
 
@@ -600,7 +600,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_AUTHENTICATE) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_AUTHENTICATE, message->command());
 
@@ -640,7 +640,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_ASSOCIATE) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_ASSOCIATE, message->command());
 
@@ -680,7 +680,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_CONNECT) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_CONNECT, message->command());
 
@@ -777,7 +777,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_DEAUTHENTICATE) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_DEAUTHENTICATE, message->command());
 
@@ -817,7 +817,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_DISCONNECT) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_DISCONNECT, message->command());
 
@@ -855,7 +855,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_NOTIFY_CQM) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_NOTIFY_CQM, message->command());
 
@@ -903,7 +903,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_DISASSOCIATE) {
   EXPECT_NE(nullptr, netlink_message);
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(NL80211_CMD_DISASSOCIATE, message->command());
 
@@ -945,7 +945,7 @@ TEST_F(NetlinkMessageTest, Parse_NL80211_CMD_UNKNOWN) {
   ASSERT_NE(nullptr, netlink_message.get());
   EXPECT_EQ(kNl80211FamilyId, netlink_message->message_type());
   // The following is legal if the message_type is kNl80211FamilyId.
-  unique_ptr<Nl80211Message> message(dynamic_cast<Nl80211Message*>(
+  unique_ptr<Nl80211Message> message(static_cast<Nl80211Message*>(
       netlink_message.release()));
   EXPECT_EQ(kCmdNL80211_CMD_UNKNOWN, message->command());
 }
diff --git a/service_unittest.cc b/service_unittest.cc
index 855f3a67..d5c122f3 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -120,7 +120,7 @@ class ServiceTest : public PropertyStoreTest {
   typedef scoped_refptr<MockProfile> MockProfileRefPtr;
 
   ServiceMockAdaptor* GetAdaptor() {
-    return dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service_->adaptor());
   }
 
   string GetFriendlyName() { return service_->friendly_name(); }
diff --git a/test-rpc-proxy/proxy_util.cc b/test-rpc-proxy/proxy_util.cc
index f2d12387..4931546f 100644
--- a/test-rpc-proxy/proxy_util.cc
+++ b/test-rpc-proxy/proxy_util.cc
@@ -256,7 +256,8 @@ void GetXmlRpcValueFromBrilloAnyValue(
         any_value_in.Get<brillo::VariantDictionary>(), xml_rpc_value_out);
     return;
   }
-  LOG(FATAL) << __func__ << ". Unhandled type: " << any_value_in.GetTypeName();
+  LOG(FATAL) << __func__ << ". Unhandled type: "
+             << any_value_in.GetUndecoratedTypeName();
 }
 
 void GetBrilloAnyValueFromXmlRpcValue(
@@ -279,7 +280,8 @@ void GetBrilloAnyValueFromXmlRpcValue(
       GetBrilloAnyVectorFromXmlRpcArray(xml_rpc_value_in, any_value_out);
       return;
     default:
-      LOG(FATAL) << __func__ << ". Unhandled type: " << xml_rpc_value_in->getType();
+      LOG(FATAL) << __func__ << ". Unhandled type: "
+                 << xml_rpc_value_in->getType();
   }
 }
 
diff --git a/vpn/vpn_service_unittest.cc b/vpn/vpn_service_unittest.cc
index 47735438..b52331a0 100644
--- a/vpn/vpn_service_unittest.cc
+++ b/vpn/vpn_service_unittest.cc
@@ -113,7 +113,7 @@ class VPNServiceTest : public testing::Test {
   }
 
   ServiceMockAdaptor* GetAdaptor() {
-    return dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service_->adaptor());
   }
 
   std::string interface_name_;
diff --git a/wifi/scan_session.cc b/wifi/scan_session.cc
index 9d62633f..b23e7b64 100644
--- a/wifi/scan_session.cc
+++ b/wifi/scan_session.cc
@@ -246,7 +246,7 @@ void ScanSession::OnTriggerScanErrorResponse(
           break;
         }
         const ErrorAckMessage* error_ack_message =
-            dynamic_cast<const ErrorAckMessage*>(netlink_message);
+            static_cast<const ErrorAckMessage*>(netlink_message);
         if (error_ack_message->error()) {
           LOG(ERROR) << __func__ << ": Message failed: "
                      << error_ack_message->ToString();
diff --git a/wifi/wake_on_wifi.cc b/wifi/wake_on_wifi.cc
index 8ead86b7..d4600ee4 100644
--- a/wifi/wake_on_wifi.cc
+++ b/wifi/wake_on_wifi.cc
@@ -875,7 +875,7 @@ void WakeOnWiFi::OnWakeOnWiFiSettingsErrorResponse(
       }
       if (raw_message->message_type() == ErrorAckMessage::GetMessageType()) {
         const ErrorAckMessage* error_ack_message =
-            dynamic_cast<const ErrorAckMessage*>(raw_message);
+            static_cast<const ErrorAckMessage*>(raw_message);
         if (error_ack_message->error() == EOPNOTSUPP) {
           error.Populate(Error::kNotSupported);
         }
diff --git a/wifi/wifi_provider_unittest.cc b/wifi/wifi_provider_unittest.cc
index 15583fcc..dcfcb955 100644
--- a/wifi/wifi_provider_unittest.cc
+++ b/wifi/wifi_provider_unittest.cc
@@ -232,7 +232,7 @@ class WiFiProviderTest : public testing::Test {
                                     bool provide_hidden) {
     string id = base::StringToLowerASCII(
         base::StringPrintf("entry_%d", storage_entry_index_));
-    auto profile_storage = dynamic_cast<MockStore*>(profile->GetStorage());
+    auto profile_storage = static_cast<MockStore*>(profile->GetStorage());
     EXPECT_CALL(*profile_storage, GetString(id, _, _))
         .WillRepeatedly(Return(false));
     AddStringParameterToStorage(
@@ -730,7 +730,7 @@ TEST_F(WiFiProviderTest, CreateServicesFromProfileHiddenNotConnected) {
 TEST_F(WiFiProviderTest, CreateTemporaryServiceFromProfileNonWiFi) {
   const string kEntryName("name");
   auto profile_storage =
-      dynamic_cast<MockStore*>(default_profile_->GetStorage());
+      static_cast<MockStore*>(default_profile_->GetStorage());
   EXPECT_CALL(*profile_storage,
               GetString(kEntryName, WiFiService::kStorageType, _))
       .WillOnce(Return(false));
diff --git a/wifi/wifi_service.cc b/wifi/wifi_service.cc
index 4d21c7e3..684988f2 100644
--- a/wifi/wifi_service.cc
+++ b/wifi/wifi_service.cc
@@ -1238,7 +1238,6 @@ bool WiFiService::Is8021x() const {
 }
 
 WiFiRefPtr WiFiService::ChooseDevice() {
-  // TODO(pstew): Style frowns on dynamic_cast.  crbug.com/220387
   DeviceRefPtr device = nullptr;
   if (!preferred_device_.empty()) {
     device = manager()->GetEnabledDeviceByLinkName(preferred_device_);
@@ -1247,10 +1246,12 @@ WiFiRefPtr WiFiService::ChooseDevice() {
     }
   }
   if (!device) {
-    device =
-      manager()->GetEnabledDeviceWithTechnology(Technology::kWifi);
+    device = manager()->GetEnabledDeviceWithTechnology(Technology::kWifi);
   }
-  return dynamic_cast<WiFi*>(device.get());
+  // If we have a valid device here, it's better be a WiFi device.
+  CHECK(!device || device->technology() == Technology::kWifi)
+      << "Unexpected device technology: " << device->technology();
+  return static_cast<WiFi*>(device.get());
 }
 
 void WiFiService::ResetWiFi() {
diff --git a/wifi/wifi_service_unittest.cc b/wifi/wifi_service_unittest.cc
index ee5dec97..3fa3464a 100644
--- a/wifi/wifi_service_unittest.cc
+++ b/wifi/wifi_service_unittest.cc
@@ -186,7 +186,7 @@ class WiFiServiceTest : public PropertyStoreTest {
                                   0);
   }
   ServiceMockAdaptor* GetAdaptor(WiFiService* service) {
-    return dynamic_cast<ServiceMockAdaptor*>(service->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service->adaptor());
   }
   Error::Type TestConfigurePassphrase(const string& security,
                                       const char* passphrase) {
diff --git a/wifi/wifi_unittest.cc b/wifi/wifi_unittest.cc
index 45fff380..d56e2dbf 100644
--- a/wifi/wifi_unittest.cc
+++ b/wifi/wifi_unittest.cc
@@ -1003,7 +1003,7 @@ class WiFiObjectTest : public ::testing::TestWithParam<string> {
     return wifi_->supplicant_process_proxy_.get();
   }
   MockSupplicantInterfaceProxy* GetSupplicantInterfaceProxyFromWiFi() {
-    return dynamic_cast<MockSupplicantInterfaceProxy*>(
+    return static_cast<MockSupplicantInterfaceProxy*>(
         wifi_->supplicant_interface_proxy_.get());
   }
   // This function returns the supplicant interface proxy whether
diff --git a/wimax/wimax_service_unittest.cc b/wimax/wimax_service_unittest.cc
index 90644dc2..8037cc87 100644
--- a/wimax/wimax_service_unittest.cc
+++ b/wimax/wimax_service_unittest.cc
@@ -99,7 +99,7 @@ class WiMaxServiceTest : public testing::Test {
   }
 
   ServiceMockAdaptor* GetAdaptor() {
-    return dynamic_cast<ServiceMockAdaptor*>(service_->adaptor());
+    return static_cast<ServiceMockAdaptor*>(service_->adaptor());
   }
 
   std::unique_ptr<MockWiMaxNetworkProxy> proxy_;