[client-hints] Populate 'sec-ch-ua-model' and 'sec-ch-ua-arch'

A smidge of refactoring for the user agent string code as well.

(Relanding crrev.com/c/1951446 after fixing MacOSX cpuinfo)

Bug: 1001125
Change-Id: I237011f3d85bde2cfe8bcf40731b442df27fe481
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955958Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Aaron Tagliaboschi <aarontag@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723035}

chrome/browser/chrome_content_browser_client.cc

@@ -1112,10 +1112,8 @@ blink::UserAgentMetadata GetUserAgentMetadata() {
   metadata.full_version = version_info::GetVersionNumber();
   metadata.major_version = version_info::GetMajorVersionNumber();
   metadata.platform = version_info::GetOSType();
-
-  // TODO(mkwst): Poke at BuildUserAgentFromProduct to split out these pieces.
-  metadata.architecture = "";
-  metadata.model = "";
+  metadata.architecture = content::BuildCpuInfo();
+  metadata.model = content::BuildModelInfo();
 
   return metadata;
 }

chrome/browser/chrome_content_browser_client_unittest.cc

@@ -485,6 +485,6 @@ TEST(ChromeContentBrowserClientTest, UserAgentMetadata) {
   EXPECT_EQ(metadata.full_version, version_info::GetVersionNumber());
   EXPECT_EQ(metadata.major_version, version_info::GetMajorVersionNumber());
   EXPECT_EQ(metadata.platform, version_info::GetOSType());
-  EXPECT_EQ(metadata.architecture, "");
-  EXPECT_EQ(metadata.model, "");
+  EXPECT_EQ(metadata.architecture, content::BuildCpuInfo());
+  EXPECT_EQ(metadata.model, content::BuildModelInfo());
 }

content/common/user_agent.cc

@@ -60,56 +60,68 @@ std::string GetWebKitRevision() {
   return WEBKIT_SVN_REVISION;
 }
 
-std::string BuildOSCpuInfo(bool include_android_build_number) {
-  std::string os_cpu;
+std::string BuildCpuInfo() {
+  std::string cpuinfo = "";
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ||\
-    defined(OS_ANDROID)
-  int32_t os_major_version = 0;
-  int32_t os_minor_version = 0;
-  int32_t os_bugfix_version = 0;
-  base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
-                                               &os_minor_version,
-                                               &os_bugfix_version);
-#endif
-
-#if defined(OS_WIN)
-  std::string architecture_token;
+#if defined(OS_MACOSX)
+  cpuinfo = "Intel";
+#elif defined(OS_WIN)
   base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
   if (os_info->wow64_status() == base::win::OSInfo::WOW64_ENABLED) {
-    architecture_token = "; WOW64";
+    cpuinfo = "WOW64";
   } else {
     base::win::OSInfo::WindowsArchitecture windows_architecture =
         os_info->GetArchitecture();
     if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE)
-      architecture_token = "; Win64; x64";
+      cpuinfo = "Win64; x64";
     else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)
-      architecture_token = "; Win64; IA64";
+      cpuinfo = "Win64; IA64";
   }
-#elif defined(OS_ANDROID)
-  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
-  std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
   // Should work on any Posix system.
   struct utsname unixinfo;
   uname(&unixinfo);
 
-  std::string cputype;
   // special case for biarch systems
   if (strcmp(unixinfo.machine, "x86_64") == 0 &&
       sizeof(void*) == sizeof(int32_t)) {
-    cputype.assign("i686 (x86_64)");
+    cpuinfo.assign("i686 (x86_64)");
   } else {
-    cputype.assign(unixinfo.machine);
+    cpuinfo.assign(unixinfo.machine);
   }
 #endif
 
+  return cpuinfo;
+}
+
+std::string BuildOSCpuInfo(bool include_android_build_number) {
+  std::string cputype = BuildCpuInfo();
+  std::string os_cpu;
+
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || \
+    defined(OS_ANDROID)
+  int32_t os_major_version = 0;
+  int32_t os_minor_version = 0;
+  int32_t os_bugfix_version = 0;
+  base::SysInfo::OperatingSystemVersionNumbers(
+      &os_major_version, &os_minor_version, &os_bugfix_version);
+#endif
+
+#if defined(OS_ANDROID)
+  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
+  std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+  // Should work on any Posix system.
+  struct utsname unixinfo;
+  uname(&unixinfo);
+#endif
+
   base::StringAppendF(&os_cpu,
 #if defined(OS_WIN)
-                      "Windows NT %d.%d%s", os_major_version, os_minor_version,
-                      architecture_token.c_str()
+                      "Windows NT %d.%d; %s", os_major_version,
+                      os_minor_version, cputype.c_str()
 #elif defined(OS_MACOSX)
-                      "Intel Mac OS X %d_%d_%d", os_major_version,
+                      "%s Mac OS X %d_%d_%d", cputype.c_str(), os_major_version,
                       os_minor_version, os_bugfix_version
 #elif defined(OS_CHROMEOS)
                       "CrOS "
@@ -146,6 +158,17 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
   return BuildUserAgentFromOSAndProduct(os_info, product);
 }
 
+std::string BuildModelInfo() {
+  std::string model = "";
+#if defined(OS_ANDROID)
+  // Only send the model information if on the release build of Android,
+  // matching user agent behaviour.
+  if (base::SysInfo::GetAndroidBuildCodename() == "REL")
+    model = base::SysInfo::HardwareModelName();
+#endif
+  return model;
+}
+
 #if defined(OS_ANDROID)
 std::string BuildUserAgentFromProductAndExtraOSInfo(
     const std::string& product,
@@ -163,9 +186,8 @@ std::string GetAndroidOSInfo(bool include_android_build_number) {
 
   // Send information about the device.
   bool semicolon_inserted = false;
-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
-  std::string android_device_name = base::SysInfo::HardwareModelName();
-  if (!android_device_name.empty() && "REL" == android_build_codename) {
+  std::string android_device_name = BuildModelInfo();
+  if (!android_device_name.empty()) {
     android_info_str += "; " + android_device_name;
     semicolon_inserted = true;
   }

content/public/common/user_agent.h

@@ -35,6 +35,10 @@ CONTENT_EXPORT std::string GetWebKitVersion();
 
 CONTENT_EXPORT std::string GetWebKitRevision();
 
+// Builds a string that describes the CPU type when available (or blank
+// otherwise).
+CONTENT_EXPORT std::string BuildCpuInfo();
+
 // Builds a User-agent compatible string that describes the OS and CPU type.
 // On Android, the string will only include the build number if true is passed
 // as an argument.
@@ -49,6 +53,10 @@ CONTENT_EXPORT base::StringPiece GetFrozenUserAgent(bool mobile);
 CONTENT_EXPORT std::string BuildUserAgentFromProduct(
     const std::string& product);
 
+// Returns the model information. Returns a blank string if not on Android or
+// if on a codenamed (i.e. not a release) build of an Android.
+CONTENT_EXPORT std::string BuildModelInfo();
+
 #if defined(OS_ANDROID)
 // Helper function to generate a full user agent string given a short
 // product name and some extra text to be added to the OS info.

content/shell/browser/shell_content_browser_client.cc

@@ -189,10 +189,8 @@ blink::UserAgentMetadata GetShellUserAgentMetadata() {
   metadata.full_version = CONTENT_SHELL_VERSION;
   metadata.major_version = CONTENT_SHELL_MAJOR_VERSION;
   metadata.platform = BuildOSCpuInfo(false);
-
-  // TODO(mkwst): Split these out from BuildOSCpuInfo().
-  metadata.architecture = "";
-  metadata.model = "";
+  metadata.architecture = BuildCpuInfo();
+  metadata.model = BuildModelInfo();
 
   return metadata;
 }

weblayer/browser/content_browser_client_impl.cc

@@ -173,9 +173,8 @@ blink::UserAgentMetadata ContentBrowserClientImpl::GetUserAgentMetadata() {
   metadata.full_version = version_info::GetVersionNumber();
   metadata.major_version = version_info::GetMajorVersionNumber();
   metadata.platform = version_info::GetOSType();
-
-  metadata.architecture = "";
-  metadata.model = "";
+  metadata.architecture = content::BuildCpuInfo();
+  metadata.model = content::BuildModelInfo();
 
   return metadata;
 }