shill: do not use in Callback80211Metrics if WiFi is disabled
Fix ChromeosDaemonUnittest so that Callback80211Metrics is not used
when WiFi is disabled.
While there, include <base/bind.h> in shill_main.cc to support the
use of base::Bind in main().
BUG: None
Change-Id: I9db2115e9f6bd1339b1e2b3fa91827bca2234a76
TEST: shill compiles successfully in Android both when WiFi is enabled.
TEST: shill compiles successfully in Android both when WiFi is disabled.
diff --git a/chromeos_daemon_unittest.cc b/chromeos_daemon_unittest.cc
index 985ac61..7496f6b 100644
--- a/chromeos_daemon_unittest.cc
+++ b/chromeos_daemon_unittest.cc
@@ -89,10 +89,12 @@
dispatcher_(new EventDispatcherForTest()),
control_(new MockControl()),
metrics_(new MockMetrics(dispatcher_)),
- callback_metrics_(new Callback80211Metrics(metrics_)),
manager_(new MockManager(control_,
dispatcher_,
metrics_)),
+#if !defined(DISABLE_WIFI)
+ callback_metrics_(new Callback80211Metrics(metrics_)),
+#endif // DISABLE_WIFI
device_info_(control_,
dispatcher_,
metrics_,
@@ -109,11 +111,11 @@
daemon_.manager_.reset(manager_); // Passes ownership
daemon_.control_.reset(control_); // Passes ownership
daemon_.dispatcher_.reset(dispatcher_); // Passes ownership
- // Passes ownership
- daemon_.callback80211_metrics_.reset(callback_metrics_);
#if !defined(DISABLE_WIFI)
daemon_.netlink_manager_ = &netlink_manager_;
+ // Passes ownership
+ daemon_.callback80211_metrics_.reset(callback_metrics_);
#endif // DISABLE_WIFI
}
void StartDaemon() {
@@ -146,10 +148,10 @@
EventDispatcherForTest* dispatcher_;
MockControl* control_;
MockMetrics* metrics_;
- Callback80211Metrics* callback_metrics_;
MockManager* manager_;
#if !defined(DISABLE_WIFI)
MockNetlinkManager netlink_manager_;
+ Callback80211Metrics* callback_metrics_;
#endif // DISABLE_WIFI
DeviceInfo device_info_;
};