No longer need the branch number +1 bump

Bug: 964451
Change-Id: I27f4a28ade2cee226c5a65b366d9aaeda503d0ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1618013Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661003}

build/util/android_chrome_version.py

@@ -90,14 +90,8 @@ ARCH_CHOICES = ARCH_VERSION_CODE_DIFF.keys()
 
 We choose 5 because it won't conflict with values in
 ANDROID_CHROME_APK_VERSION_CODE_DIFFS
-
-We also increment BUILD (branch) number to ensure that the version code is
-higher for the next build than any build with the same BUILD value (even if the
-other builds have a higher PATCH value). This is needed for release logistics
-when working with unreleased Android versions: upgrading android will install
-the chrome build (the "next" build) that uses the new android sdk.
 """
-NEXT_BUILD_VERSION_CODE_DIFF = 100005
+NEXT_BUILD_VERSION_CODE_DIFF = 5
 
 """For 64-bit architectures, some packages have multiple targets with version
 codes that differ by the second-to-last digit (the architecture digit). This is

build/util/android_chrome_version_test.py

@@ -101,10 +101,10 @@ class _VersionTest(unittest.TestCase):
     webview_stable_version_code = output['WEBVIEW_STABLE_VERSION_CODE']
     webview_beta_version_code = output['WEBVIEW_BETA_VERSION_CODE']
 
-    self.assertEqual(chrome_version_code, '372100005')
-    self.assertEqual(monochrome_version_code, '372100007')
-    self.assertEqual(webview_stable_version_code, '372100005')
-    self.assertEqual(webview_beta_version_code, '372100006')
+    self.assertEqual(chrome_version_code, '372000005')
+    self.assertEqual(monochrome_version_code, '372000007')
+    self.assertEqual(webview_stable_version_code, '372000005')
+    self.assertEqual(webview_beta_version_code, '372000006')
 
   def testGenerateVersionCodesAndroidArchArm(self):
     """Assert it handles different architectures correctly.