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 {
diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
index f8aed7c..bce0920 100644
--- a/libcurl_http_fetcher.cc
+++ b/libcurl_http_fetcher.cc
@@ -33,7 +33,6 @@
#include <base/strings/stringprintf.h>
#include <base/threading/thread_task_runner_handle.h>
-
#ifdef __ANDROID__
#include <cutils/qtaguid.h>
#include <private/android_filesystem_config.h>
@@ -464,12 +463,12 @@
// possible to watch file descriptors. Just poll it later. This usually
// happens if brillo::FakeMessageLoop is used.
if (!base::ThreadTaskRunnerHandle::IsSet()) {
- MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&LibcurlHttpFetcher::CurlPerformOnce,
- base::Unretained(this)),
- TimeDelta::FromSeconds(1));
- return;
+ MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
+ base::Bind(&LibcurlHttpFetcher::CurlPerformOnce,
+ base::Unretained(this)),
+ TimeDelta::FromSeconds(1));
+ return;
}
#endif
SetupMessageLoopSources();
diff --git a/payload_consumer/certificate_parser_stub.cc b/payload_consumer/certificate_parser_stub.cc
index 95fd6e8..a365ab8 100644
--- a/payload_consumer/certificate_parser_stub.cc
+++ b/payload_consumer/certificate_parser_stub.cc
@@ -14,7 +14,7 @@
// limitations under the License.
//
-#include <payload_consumer/certificate_parser_stub.h>
+#include "update_engine/payload_consumer/certificate_parser_stub.h"
namespace chromeos_update_engine {
bool CertificateParserStub::ReadPublicKeysFromCertificates(
diff --git a/payload_consumer/certificate_parser_stub.h b/payload_consumer/certificate_parser_stub.h
index f4f8825..a51c2c6 100644
--- a/payload_consumer/certificate_parser_stub.h
+++ b/payload_consumer/certificate_parser_stub.h
@@ -23,7 +23,7 @@
#include <base/macros.h>
-#include "payload_consumer/certificate_parser_interface.h"
+#include "update_engine/payload_consumer/certificate_parser_interface.h"
namespace chromeos_update_engine {
class CertificateParserStub : public CertificateParserInterface {
diff --git a/payload_consumer/partition_update_generator_stub.cc b/payload_consumer/partition_update_generator_stub.cc
index e2b64ec..8f73fbb 100644
--- a/payload_consumer/partition_update_generator_stub.cc
+++ b/payload_consumer/partition_update_generator_stub.cc
@@ -30,7 +30,7 @@
namespace partition_update_generator {
std::unique_ptr<PartitionUpdateGeneratorInterface> Create(
- BootControlInterface* boot_control) {
+ BootControlInterface* boot_control, size_t block_size)) {
return std::make_unique<PartitionUpdateGeneratorStub>();
}
} // namespace partition_update_generator
diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index 94d0392..e8fa81b 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -224,7 +224,6 @@
progress_fd_,
base::BindRepeating(&PostinstallRunnerAction::OnProgressFdReady,
base::Unretained(this)));
-
}
void PostinstallRunnerAction::OnProgressFdReady() {