Update to build against libchrome-271506.
BUG=chromium:375032
TEST=`FEATURES=test emerge-$BOARD cros_boot_mode`
Change-Id: Ie1c17836622618b84637ac19fb04bb5d19cc5fd3
Reviewed-on: https://chromium-review.googlesource.com/201053
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/Makefile b/Makefile
index 3a50c8d..3d57795 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
# Pull in chromium os defaults
include common.mk
-BASE_VER ?= 242728
+BASE_VER ?= 271506
PC_DEPS = libchrome-$(BASE_VER)
PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(PC_DEPS))
PC_LIBS := $(shell $(PKG_CONFIG) --libs $(PC_DEPS))
diff --git a/boot_mode_unittest.cc b/boot_mode_unittest.cc
index b852a22..dc8f8f7 100644
--- a/boot_mode_unittest.cc
+++ b/boot_mode_unittest.cc
@@ -49,19 +49,19 @@
// that the "system" booted in.
void UpdateFiles(int chsw, int fw, const char *cmdline) {
std::string data = base::StringPrintf("%d", chsw);
- EXPECT_EQ(file_util::WriteFile(
+ EXPECT_EQ(base::WriteFile(
base::FilePath(developer_switch_.platform_file_path()),
data.c_str(), data.length()),
data.length());
data = base::StringPrintf("%d", fw);
- EXPECT_EQ(file_util::WriteFile(
+ EXPECT_EQ(base::WriteFile(
base::FilePath(active_main_firmware_.platform_file_path()),
data.c_str(), data.length()),
data.length());
data.assign(cmdline);
- EXPECT_EQ(file_util::WriteFile(
+ EXPECT_EQ(base::WriteFile(
base::FilePath(bootloader_type_.platform_file_path()),
data.c_str(), data.length()),
data.length());
diff --git a/bootloader_type_unittest.cc b/bootloader_type_unittest.cc
index fb64c2f..f7a828c 100644
--- a/bootloader_type_unittest.cc
+++ b/bootloader_type_unittest.cc
@@ -44,8 +44,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kChromeOS]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kChromeOS);
@@ -56,8 +56,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kChromeOS]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kChromeOS);
@@ -68,8 +68,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kChromeOS]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kUnsupported);
@@ -80,8 +80,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kChromeOS]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kUnsupported);
@@ -92,8 +92,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kChromeOS]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kUnsupported);
@@ -106,8 +106,8 @@
cros_boot_mode::BootloaderType::kSupportedBootloaders[
cros_boot_mode::BootloaderType::kDebug]);
- EXPECT_EQ(file_util::WriteFile(base::FilePath(type_file_path_),
- contents.c_str(), contents.length()),
+ EXPECT_EQ(base::WriteFile(base::FilePath(type_file_path_),
+ contents.c_str(), contents.length()),
contents.length());
type_.Initialize();
ExpectType(cros_boot_mode::BootloaderType::kDebug);
diff --git a/developer_switch_unittest.cc b/developer_switch_unittest.cc
index eee37cd..7a1fb22 100644
--- a/developer_switch_unittest.cc
+++ b/developer_switch_unittest.cc
@@ -40,51 +40,44 @@
cros_boot_mode::DeveloperSwitch switch_;
};
-
TEST_F(DeveloperSwitchTest, Disabled) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "0", 2), 2);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "0", 2), 2);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kDisabled);
}
TEST_F(DeveloperSwitchTest, DisabledWithOtherSwitches) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "528", 4),
- 4);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "528", 4), 4);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kDisabled);
}
TEST_F(DeveloperSwitchTest, Enabled) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "32", 3),
- 3);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "32", 3), 3);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kEnabled);
}
TEST_F(DeveloperSwitchTest, EnabledWithOtherSwitches) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "544", 4),
- 4);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "544", 4), 4);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kEnabled);
}
TEST_F(DeveloperSwitchTest, EnabledWithOtherSwitches2) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "4128", 5),
- 5);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "4128", 5), 5);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kEnabled);
}
TEST_F(DeveloperSwitchTest, EnabledWithOtherSwitches3) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "65535", 6),
- 6);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "65535", 6), 6);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kEnabled);
}
TEST_F(DeveloperSwitchTest, BadTruncationMakesUnsupported) {
- EXPECT_EQ(
- file_util::WriteFile(base::FilePath(switch_file_path_), "100000", 7), 7);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "100000", 7), 7);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kUnsupported);
}
@@ -95,14 +88,13 @@
}
TEST_F(DeveloperSwitchTest, UnsupportedPlatform) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "-1", 3),
- 3);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "-1", 3), 3);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kUnsupported);
}
TEST_F(DeveloperSwitchTest, EmptyFile) {
- EXPECT_EQ(file_util::WriteFile(base::FilePath(switch_file_path_), "", 0), 0);
+ EXPECT_EQ(base::WriteFile(base::FilePath(switch_file_path_), "", 0), 0);
switch_.Initialize();
ExpectPosition(cros_boot_mode::PlatformSwitch::kUnsupported);
}
