mac: Tolerate "universal" and "arm64" prefixes in KSProductID.

Bug: 1147858,1116601,1142017
Change-Id: I1611af0945f340f704055bedb3e1bffd5765c8f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533015
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826366}

chrome/common/channel_info_mac.mm

@@ -22,18 +22,30 @@ std::string GetChannelName() {
 
   // Only ever return "", "unknown", "beta", "dev", or "canary" in a branded
   // build.
+  // KSProductID is not set (for stable) or "beta", "dev" or "canary" for
+  // the intel-only build.
+  // KSProductID is "arm64" (for stable) or "arm64-beta", "arm64-dev" or
+  // "arm64-canary" for the arm-only build.
+  // KSProductID is "universal" (for stable) or "universal-beta",
+  // "universal-dev" or "universal-canary" for the arm+intel universal binary.
   if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
     // This build is not Keystone-enabled, it can't have a channel.
     channel = @"unknown";
-  } else if (!channel) {
-    // For the stable channel, KSChannelID is not set.
+  } else if (!channel || [channel isEqual:@"arm64"] ||
+             [channel isEqual:@"universal"]) {
+    // For the intel stable channel, KSChannelID is not set.
     channel = @"";
-  } else if ([channel isEqual:@"beta"] ||
-             [channel isEqual:@"dev"] ||
-             [channel isEqual:@"canary"]) {
-    // do nothing.
   } else {
-    channel = @"unknown";
+    if ([channel hasPrefix:@"arm64-"])
+      channel = [channel substringFromIndex:[@"arm64-" length]];
+    else if ([channel hasPrefix:@"universal-"])
+      channel = [channel substringFromIndex:[@"universal-" length]];
+    if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"] ||
+        [channel isEqual:@"canary"]) {
+      // do nothing.
+    } else {
+      channel = @"unknown";
+    }
   }
 
   return base::SysNSStringToUTF8(channel);
@@ -67,10 +79,10 @@ bool IsSideBySideCapable() {
     return true;
   }
 
-  if (![bundle objectForInfoDictionaryKey:@"KSChannelID"]) {
-    // For the stable channel, KSChannelID is not set. Stable Chromes are what
-    // side-by-side capable Chromes are running side-by-side *to* and by
-    // definition are side-by-side capable.
+  if (GetChannelName().empty()) {
+    // For the stable channel, GetChannelName() returns the empty string.
+    // Stable Chromes are what side-by-side capable Chromes are running
+    // side-by-side *to* and by definition are side-by-side capable.
     return true;
   }
 

components/crash/core/app/crashpad_mac.mm

@@ -56,10 +56,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
 #endif
       NSString* channel = base::mac::ObjCCast<NSString>(
           [outer_bundle objectForInfoDictionaryKey:@"KSChannelID"]);
-      if (channel) {
+      if (!channel || [channel isEqual:@"arm64"] ||
+          [channel isEqual:@"universal"]) {
+        if (allow_empty_channel)
+          process_annotations["channel"] = "";
+      } else {
+        if ([channel hasPrefix:@"arm64-"])
+          channel = [channel substringFromIndex:[@"arm64-" length]];
+        else if ([channel hasPrefix:@"universal-"])
+          channel = [channel substringFromIndex:[@"universal-" length]];
         process_annotations["channel"] = base::SysNSStringToUTF8(channel);
-      } else if (allow_empty_channel) {
-        process_annotations["channel"] = "";
       }
 
       NSString* version =