Fix remaining styling and compiling issues
Bug: 163153182
Test: FEATURES=test emerge-reef update_engine
Change-Id: I12d95920946fee1866f721783f16795c1ad4c2d9
diff --git a/common/fake_hardware.h b/common/fake_hardware.h
index 30b5718..82382ff 100644
--- a/common/fake_hardware.h
+++ b/common/fake_hardware.h
@@ -202,7 +202,7 @@
build_timestamp_ = build_timestamp;
}
- void SetWarmReset(bool warm_reset) { warm_reset_ = warm_reset; }
+ void SetWarmReset(bool warm_reset) override { warm_reset_ = warm_reset; }
// Getters to verify state.
int GetMaxKernelKeyRollforward() const { return kernel_max_rollforward_; }
diff --git a/common/subprocess_unittest.cc b/common/subprocess_unittest.cc
index 74fee61..b4d068f 100644
--- a/common/subprocess_unittest.cc
+++ b/common/subprocess_unittest.cc
@@ -75,7 +75,6 @@
brillo::AsynchronousSignalHandler async_signal_handler_;
Subprocess subprocess_;
unique_ptr<base::FileDescriptorWatcher::Controller> watcher_;
-
};
namespace {