Automated commit: libchrome r1185790 uprev
Merge with upstream commit a99f5c878101708574da4905690f74069d15760e
BUG=None
TEST=sudo emerge libchrome
Change-Id: Ie29dbe6bb73fe5be1e1427ce982278d225e63710
diff --git a/BASE_VER b/BASE_VER
index f04059a..250b4d2 100644
--- a/BASE_VER
+++ b/BASE_VER
@@ -1 +1 @@
-1185491
+1185790
diff --git a/base/allocator/partition_allocator/partition_root.cc b/base/allocator/partition_allocator/partition_root.cc
index a82210c..b805706 100644
--- a/base/allocator/partition_allocator/partition_root.cc
+++ b/base/allocator/partition_allocator/partition_root.cc
@@ -1313,7 +1313,7 @@
const bool hooks_enabled = PartitionAllocHooks::AreHooksEnabled();
bool overridden = false;
size_t old_usable_size;
- if (PA_UNLIKELY(!no_hooks && hooks_enabled)) {
+ if (!no_hooks && hooks_enabled) {
overridden = PartitionAllocHooks::ReallocOverrideHookIfEnabled(
&old_usable_size, ptr);
}
diff --git a/base/allocator/partition_allocator/partition_root.h b/base/allocator/partition_allocator/partition_root.h
index 446b5bc..5409199 100644
--- a/base/allocator/partition_allocator/partition_root.h
+++ b/base/allocator/partition_allocator/partition_root.h
@@ -1901,7 +1901,7 @@
#endif // defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
void* object = nullptr;
const bool hooks_enabled = PartitionAllocHooks::AreHooksEnabled();
- if (PA_UNLIKELY(hooks_enabled)) {
+ if (hooks_enabled) {
unsigned int additional_flags = 0;
#if PA_CONFIG(HAS_MEMORY_TAGGING)
if (IsMemoryTaggingEnabled()) {
diff --git a/base/system/sys_info_chromeos.cc b/base/system/sys_info_chromeos.cc
index da4f2ce..a0e6f93 100644
--- a/base/system/sys_info_chromeos.cc
+++ b/base/system/sys_info_chromeos.cc
@@ -172,6 +172,9 @@
// static
std::string SysInfo::HardwareModelName() {
std::string board = GetLsbReleaseBoard();
+ if (board == "unknown") {
+ return "";
+ }
// GetLsbReleaseBoard() may be suffixed with a "-signed-" and other extra
// info. Strip it.
const size_t index = board.find("-signed-");
