Populate the missing fields in the UA string (#7085)

Populate the missing fields for the 3P UA string
using the starboard system properties.

Remove is_robolectric from starboard/build/config/os_definitions.gni
as it is in conflict with build/toolchain/android/BUILD.gn.

Issue: 437414261

Author: y4vor

base/BUILD.gn

@@ -2291,6 +2291,8 @@ component("base") {
       "system/sys_info_starboard.cc",
       "system/sys_info_starboard.h",
     ]
+
+    deps += [ "//starboard/common:common_headers_only" ]
   }
 
   if (use_blink) {
@@ -5054,7 +5056,7 @@ source_set("partition_alloc_test_support") {
 }
 
 if (enable_cobalt_hermetic_hacks) {
-  # TODO: b/413130400 - Cobalt: Remove this config 
+  # TODO: b/413130400 - Cobalt: Remove this config
   # after removing base/starboard/linker_stub.h
   config("base_starboard_linker_stub") {
     cflags = ["-Wno-unreachable-code-break"]

base/system/sys_info.cc

@@ -141,7 +141,7 @@ bool SysInfo::IsLowEndDeviceImpl() {
 #endif
 
 #if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_WIN) && \
-    !BUILDFLAG(IS_CHROMEOS)
+    !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_STARBOARD)
 std::string SysInfo::HardwareModelName() {
   return std::string();
 }

base/system/sys_info_starboard.cc

@@ -18,11 +18,19 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include <sys/system_properties.h>
-#else
-// TODO(b/374213479): Remove after the functions below are implemented.
-#include "base/notreached.h"
+#elif BUILDFLAG(IS_STARBOARD)
+#include "base/system/sys_info.h"
+#include "starboard/common/system_property.h"
+using starboard::GetSystemPropertyString;
 #endif  // BUILDFLAG(IS_ANDROID)
 
+#if BUILDFLAG(IS_STARBOARD)
+namespace base {
+std::string SysInfo::HardwareModelName() {
+  return GetSystemPropertyString(kSbSystemPropertyModelName);
+}
+}
+#endif // BUILDFLAG(IS_STARBOARD)
 namespace base {
 namespace starboard {
 
@@ -64,29 +72,21 @@ std::string SbSysInfo::Brand() {
   __system_property_get("ro.product.brand", brand_str);
   return std::string(brand_str);
 }
-#else
+#elif BUILDFLAG(IS_STARBOARD)
 std::string SbSysInfo::OriginalDesignManufacturer() {
-  // TODO(b/374213479): Implement for non-Android.
-  NOTIMPLEMENTED();
-  return "";
+  return GetSystemPropertyString(kSbSystemPropertySystemIntegratorName);
 }
 
 std::string SbSysInfo::ChipsetModelNumber() {
-  // TODO(b/374213479): Implement for non-Android.
-  NOTIMPLEMENTED();
-  return "";
+  return GetSystemPropertyString(kSbSystemPropertyChipsetModelNumber);
 }
 
 std::string SbSysInfo::ModelYear() {
-  // TODO(b/374213479): Implement for non-Android.
-  NOTIMPLEMENTED();
-  return "";
+  return GetSystemPropertyString(kSbSystemPropertyModelYear);
 }
 
 std::string SbSysInfo::Brand() {
-  // TODO(b/374213479): Implement for non-Android.
-  NOTIMPLEMENTED();
-  return "";
+  return GetSystemPropertyString(kSbSystemPropertyBrandName);
 }
 #endif  // BUILDFLAG(IS_ANDROID)
 

base/time/time.h

@@ -1243,7 +1243,7 @@ class BASE_EXPORT ThreadTicks : public time_internal::TimeBase<ThreadTicks> {
   // Returns true if ThreadTicks::Now() is supported on this system.
   [[nodiscard]] static bool IsSupported() {
 #if BUILDFLAG(IS_STARBOARD)
-    return starboard::CurrentMonotonicThreadTime() != 0;
+    return ::starboard::CurrentMonotonicThreadTime() != 0;
 #elif (defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
     BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
     return true;

cobalt/browser/cobalt_content_browser_client.cc

@@ -37,6 +37,7 @@
 #include "cobalt/shell/browser/shell.h"
 #include "cobalt/shell/browser/shell_paths.h"
 #include "cobalt/shell/common/shell_switches.h"
+#include "cobalt/version.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -90,15 +91,12 @@ std::string GetCobaltUserAgent() {
 
 blink::UserAgentMetadata GetCobaltUserAgentMetadata() {
   blink::UserAgentMetadata metadata;
-
-#define COBALT_BRAND_NAME "Cobalt"
-#define COBALT_MAJOR_VERSION "26"
-#define COBALT_VERSION "26.lts.0-qa"
-  metadata.brand_version_list.emplace_back(COBALT_BRAND_NAME,
+  const UserAgentPlatformInfo platform_info;
+  metadata.brand_version_list.emplace_back(platform_info.brand().value_or(""),
                                            COBALT_MAJOR_VERSION);
-  metadata.brand_full_version_list.emplace_back(COBALT_BRAND_NAME,
-                                                COBALT_VERSION);
-  metadata.full_version = COBALT_VERSION;
+  metadata.brand_full_version_list.emplace_back(
+      platform_info.brand().value_or(""), platform_info.cobalt_version());
+  metadata.full_version = platform_info.cobalt_version();
   metadata.platform = "Starboard";
   metadata.architecture = content::GetCpuArchitecture();
   metadata.model = content::BuildModelInfo();

cobalt/browser/user_agent/user_agent_platform_info.cc

@@ -26,6 +26,7 @@
 #include "base/system/sys_info.h"
 #include "base/system/sys_info_starboard.h"
 #include "build/build_config.h"
+#include "starboard/common/system_property.h"
 #include "starboard/extension/platform_info.h"
 
 #include "cobalt/cobalt_build_id.h"  // Generated
@@ -201,15 +202,14 @@ void InitializeUserAgentPlatformInfoFields(UserAgentPlatformInfo& info) {
   }
 #endif  // ENABLE_DEBUG_COMMAND_LINE_SWITCHES
 
-#if BUILDFLAG(IS_ANDROID)
-  info.set_device_type("ATV");
-#else
-  info.set_device_type("TV");
-#endif  // BUILDFLAG(IS_ANDROID)
+  info.set_device_type(
+      starboard::GetSystemPropertyString(kSbSystemPropertyDeviceType));
 
-// TODO(cobalt, b/374213479): figure out firmware version for other platforms.
 #if BUILDFLAG(IS_ANDROID)
   info.set_firmware_version(base::SysInfo::GetAndroidBuildID());
+#elif BUILDFLAG(IS_STARBOARD)
+  info.set_firmware_version(
+      starboard::GetSystemPropertyString(kSbSystemPropertyFirmwareVersion));
 #endif  // BUILDFLAG(IS_ANDROID)
 
   info.set_model(base::SysInfo::HardwareModelName());
@@ -224,12 +224,8 @@ void InitializeUserAgentPlatformInfoFields(UserAgentPlatformInfo& info) {
   // Below UA info fields can NOT be retrieved directly from platform's native
   // system properties.
 
-  char value[1024];
-  bool result =
-      SbSystemGetProperty(kSbSystemPropertyUserAgentAuxField, value, 1024);
-  if (result) {
-    info.set_aux_field(value);
-  }
+  info.set_aux_field(
+      starboard::GetSystemPropertyString(kSbSystemPropertyUserAgentAuxField));
 
   // We only support JIT for both Linux and Android.
   info.set_javascript_engine_version(

cobalt/version.h

@@ -36,6 +36,7 @@
 //                  release is cut.
 //.
 
+#define COBALT_MAJOR_VERSION "26"
 #define COBALT_VERSION "26.master.0"
 
 #endif  // COBALT_VERSION_H_

starboard/build/config/os_definitions.gni

@@ -28,7 +28,6 @@ is_linux = current_os == "linux"
 is_mac = current_os == "mac"
 is_nacl = current_os == "nacl"
 is_win = current_os == "win" || current_os == "winuwp"
-is_robolectric = false
 is_chromecast = false
 
 is_apple = is_ios || is_mac

starboard/common/BUILD.gn

@@ -16,7 +16,11 @@
 # to all platforms.
 
 source_set("common_headers_only") {
-  sources = [ "log.h" ]
+  sources = [
+    "log.h",
+    "system_property.h",
+  ]
+
   deps = [ "//starboard:starboard_headers_only" ]
 }
 
@@ -82,7 +86,6 @@ static_library("common") {
     "storage.cc",
     "storage.h",
     "string.h",
-    "system_property.h",
     "thread.cc",
     "thread.h",
     "time.cc",