[ios] Fix OS Name, version for synthetic crash reports

Use correct key names (osName, osVersion) as described here:
https://sites.google.com/a/google.com/crash/users/getting-started/getting-started-guide#TOC-Step-6:-Upload-crash-reports-from-your-application

Bug: 1103752
Change-Id: Ie3a7141aa31cd154cad29421a04364039f58eb10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2473377
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817499}

ios/chrome/browser/crash_report/synthetic_crash_report_util.mm

@@ -86,8 +86,9 @@ void CreateSyntheticCrashReportForUte(
   }
 
   if (previous_session.OSVersion) {
-    AppendConfig(config, "BreakpadServerParameterPrefix_os_version",
+    AppendConfig(config, "BreakpadServerParameterPrefix_osVersion",
                  base::SysNSStringToUTF8(previous_session.OSVersion));
+    AppendConfig(config, "BreakpadServerParameterPrefix_osName", "iOS");
   }
 
   AppendConfig(config, "BreakpadServerParameterPrefix_platform",

ios/chrome/browser/crash_report/synthetic_crash_report_util_unittest.mm

@@ -102,7 +102,7 @@ TEST_F(SyntheticCrashReportUtilTest, CreateSyntheticCrashReportForUte) {
 
   // Verify config file content. Config file has the following format:
   // <Key1>\n<Value1Length>\n<Value1>\n...<KeyN>\n<ValueNLength>\n<ValueN>
-  ASSERT_EQ(45U, config_lines.size())
+  ASSERT_EQ(48U, config_lines.size())
       << "<content>" << config_content << "</content>";
 
   EXPECT_EQ("MinidumpDir", config_lines[0]);
@@ -158,23 +158,27 @@ TEST_F(SyntheticCrashReportUtilTest, CreateSyntheticCrashReportForUte) {
   EXPECT_EQ(base::NumberToString(strlen(kYesString)), config_lines[31]);
   EXPECT_EQ(kYesString, config_lines[32]);
 
-  EXPECT_EQ("BreakpadServerParameterPrefix_os_version", config_lines[33]);
+  EXPECT_EQ("BreakpadServerParameterPrefix_osVersion", config_lines[33]);
   EXPECT_EQ(base::NumberToString(kOSVersion.length), config_lines[34]);
   EXPECT_EQ(base::SysNSStringToUTF8(kOSVersion), config_lines[35]);
 
-  EXPECT_EQ("BreakpadServerParameterPrefix_platform", config_lines[36]);
+  EXPECT_EQ("BreakpadServerParameterPrefix_osName", config_lines[36]);
+  EXPECT_EQ("3", config_lines[37]);
+  EXPECT_EQ("iOS", config_lines[38]);
+
+  EXPECT_EQ("BreakpadServerParameterPrefix_platform", config_lines[39]);
   EXPECT_EQ(base::NumberToString(base::SysInfo::HardwareModelName().size()),
-            config_lines[37]);
-  EXPECT_EQ(base::SysInfo::HardwareModelName(), config_lines[38]);
+            config_lines[40]);
+  EXPECT_EQ(base::SysInfo::HardwareModelName(), config_lines[41]);
 
-  EXPECT_EQ("BreakpadServerParameterPrefix_url", config_lines[39]);
-  EXPECT_EQ(base::NumberToString(kURL.length), config_lines[40]);
-  EXPECT_EQ(base::SysNSStringToUTF8(kURL), config_lines[41]);
+  EXPECT_EQ("BreakpadServerParameterPrefix_url", config_lines[42]);
+  EXPECT_EQ(base::NumberToString(kURL.length), config_lines[43]);
+  EXPECT_EQ(base::SysNSStringToUTF8(kURL), config_lines[44]);
 
-  EXPECT_EQ("BreakpadProcessUpTime", config_lines[42]);
+  EXPECT_EQ("BreakpadProcessUpTime", config_lines[45]);
   EXPECT_EQ(base::NumberToString(base::NumberToString(kUptimeMs).size()),
-            config_lines[43]);
-  EXPECT_EQ(base::NumberToString(kUptimeMs), config_lines[44]);
+            config_lines[46]);
+  EXPECT_EQ(base::NumberToString(kUptimeMs), config_lines[47]);
 
   // Read minidump file. It must be empty as there is no stack trace, but
   // Breakpad will not upload config without minidump file.