update_engine: use ScopedTempDir::GetPath
Upstream versions of libchrome have gotten rid of ScopedTempDir's
inline path method because they wanted to introduce a DCHECK that
helps make sure people create the temp directory before using it.
To avoid introducing a header dependency on the logging header
they took this method out of the header so it wouldn't be inlined.
BUG=b:37434548
TEST=unit tests
Change-Id: If1dcc5e43f54ab32fd43da7b939216a4834548d5
Reviewed-on: https://chromium-review.googlesource.com/882543
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/common/hwid_override_unittest.cc b/common/hwid_override_unittest.cc
index 26ef30a..35e6438 100644
--- a/common/hwid_override_unittest.cc
+++ b/common/hwid_override_unittest.cc
@@ -32,7 +32,7 @@
void SetUp() override {
ASSERT_TRUE(tempdir_.CreateUniqueTempDir());
- ASSERT_TRUE(base::CreateDirectory(tempdir_.path().Append("etc")));
+ ASSERT_TRUE(base::CreateDirectory(tempdir_.GetPath().Append("etc")));
}
protected:
@@ -46,22 +46,24 @@
std::string expected_hwid("expected");
std::string keyval(HwidOverride::kHwidOverrideKey);
keyval += ("=" + expected_hwid);
- ASSERT_EQ(base::WriteFile(tempdir_.path().Append("etc/lsb-release"),
- keyval.c_str(), keyval.length()),
+ ASSERT_EQ(base::WriteFile(tempdir_.GetPath().Append("etc/lsb-release"),
+ keyval.c_str(),
+ keyval.length()),
static_cast<int>(keyval.length()));
- EXPECT_EQ(expected_hwid, HwidOverride::Read(tempdir_.path()));
+ EXPECT_EQ(expected_hwid, HwidOverride::Read(tempdir_.GetPath()));
}
TEST_F(HwidOverrideTest, ReadNothing) {
std::string keyval("SOMETHING_ELSE=UNINTERESTING");
- ASSERT_EQ(base::WriteFile(tempdir_.path().Append("etc/lsb-release"),
- keyval.c_str(), keyval.length()),
+ ASSERT_EQ(base::WriteFile(tempdir_.GetPath().Append("etc/lsb-release"),
+ keyval.c_str(),
+ keyval.length()),
static_cast<int>(keyval.length()));
- EXPECT_EQ(std::string(), HwidOverride::Read(tempdir_.path()));
+ EXPECT_EQ(std::string(), HwidOverride::Read(tempdir_.GetPath()));
}
TEST_F(HwidOverrideTest, ReadFailure) {
- EXPECT_EQ(std::string(), HwidOverride::Read(tempdir_.path()));
+ EXPECT_EQ(std::string(), HwidOverride::Read(tempdir_.GetPath()));
}
} // namespace chromeos_update_engine