ios: Use mainBundle bundleVersion as part of version_lock workaround.

Bug: 1140474
Change-Id: I264270edec37ffa425a1525af5a95a9e53009310
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495005Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820288}

ios/chrome/app/application_delegate/metric_kit_subscriber.mm

@@ -271,9 +271,14 @@ void WriteDiagnosticPayloads(NSArray<MXDiagnosticPayload*>* payloads)
 #endif
 
 - (void)processPayload:(MXMetricPayload*)payload API_AVAILABLE(ios(13.0)) {
+  // TODO(crbug.com/1140474): See related bug for why |bundleVersion| comes from
+  // mainBundle instead of from version_info::GetVersionNumber(). Remove once
+  // iOS 14.2 reaches mass adoption.
+  NSString* bundleVersion =
+      [[NSBundle mainBundle] infoDictionary][(NSString*)kCFBundleVersionKey];
   if (payload.includesMultipleApplicationVersions ||
       base::SysNSStringToUTF8(payload.metaData.applicationBuildVersion) !=
-          version_info::GetVersionNumber()) {
+          base::SysNSStringToUTF8(bundleVersion)) {
     // The metrics will be reported on the current version of Chrome.
     // Ignore any report that contains data from another version to avoid
     // confusion.

ios/chrome/app/application_delegate/mock_metrickit_metric_payload.mm

@@ -17,9 +17,13 @@
 #endif
 
 id MockMXMetadata() API_AVAILABLE(ios(13.0)) {
+  // TODO(crbug.com/1140474): See related bug for why |bundleVersion| comes from
+  // mainBundle instead of from version_info::GetVersionNumber(). Remove once
+  // iOS 14.2 reaches mass adoption.
+  NSString* bundleVersion =
+      [[NSBundle mainBundle] infoDictionary][(NSString*)kCFBundleVersionKey];
   id metadata = OCMClassMock([MXMetaData class]);
-  OCMStub([metadata applicationBuildVersion])
-      .andReturn(base::SysUTF8ToNSString(version_info::GetVersionNumber()));
+  OCMStub([metadata applicationBuildVersion]).andReturn(bundleVersion);
   return metadata;
 }