Use milestone as version number for appconfig.xml

Bug: 1128264
Change-Id: I841de5c4aa05b1010b276c937f39f8337d6856db
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560994
Commit-Queue: Yann Dago <ydago@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831106}

components/policy/tools/template_writers/writers/ios_app_config_writer.py

@@ -122,7 +122,8 @@ class IOSAppConfigWriter(xml_formatted_writer.XMLFormattedWriter):
         'xsi:noNamespaceSchemaLocation'] = schema_location
 
     version = self.AddElement(self._app_config, 'version', {})
-    self.AddText(version, self.config['version'])
+    milestone = self.config['version'].split(".", 1)[0]
+    self.AddText(version, milestone)
 
     bundle_id = self.AddElement(self._app_config, 'bundleId', {})
     self.AddText(bundle_id, self.config['bundle_id'])

components/policy/tools/template_writers/writers/ios_app_config_writer_unittest.py

@@ -65,7 +65,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">string description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -93,7 +93,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">int description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -151,7 +151,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         </option>
       </options>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -209,7 +209,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         </option>
       </options>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -267,7 +267,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         </option>
       </options>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -295,7 +295,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">boolean description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -323,7 +323,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">list description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -353,7 +353,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">dict description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -381,7 +381,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">string description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -409,7 +409,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         <language value="en-US">string description</language>
       </description>
     </field>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',
@@ -448,7 +448,7 @@ class IOSAppConfigWriterUnitTests(writer_unittest_common.WriterUnittestCommon):
         </description>
       </field>
     </fieldGroup>'''
-    expected = self._GetExpectedOutput('83.0.4089.0', expected_configuration,
+    expected = self._GetExpectedOutput('83', expected_configuration,
                                        expected_presentation)
     output = self.GetOutput(policy_json, {
         '_google_chrome': '1',