Use a different plist key for iOS versioning

base/file_version_info_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_version_info_mac.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
   return base::string16();
 }
 
 base::string16 FileVersionInfoMac::legal_copyright() {
   return GetString16Value(CFSTR("CFBundleGetInfoString"));
 }
 
 base::string16 FileVersionInfoMac::product_version() {
   // On OS X, CFBundleVersion is used by LaunchServices, and must follow
   // specific formatting rules, so the four-part Chrome version is in
-  // CFBundleShortVersionString. On iOS, however, CFBundleVersion can be the
-  // full version, but CFBundleShortVersionString has a policy-enfoced limit
-  // of three version components.
+  // CFBundleShortVersionString. On iOS, both have a policy-enfoced limit
+  // of three version components, so the full version is stored in a custom
+  // key (CrBundleVersion) falling back to CFBundleVersion if not present.
 #if defined(OS_IOS)
+  base::string16 version(GetString16Value(CFSTR("CrBundleVersion")));

[rohitrao (ping after 24h), 2014/09/05 17:01:50]

We can use whatever key we want without worrying about conflicts?

[stuartmorgan, 2014/09/05 17:15:09]

I can't imagine Apple would start using Cr as a prefix, and we control
everything else that would go in here.

+  if (version.length() > 0)
+    return version;
   return GetString16Value(CFSTR("CFBundleVersion"));

[rohitrao (ping after 24h), 2014/09/05 17:01:50]

Do you intend to remove the fallback code eventually, and make CrBundleVersion
mandatory?

[stuartmorgan, 2014/09/05 17:15:09]

Since this is in base/ I wasn't planning on it. There's no reason I can think of
that another iOS app using base version info would necessarily have to have a
non-CFBundleVersion-compliant version, so forcing everyone to a different key
seemed unnecessary.

[stuartmorgan, 2014/09/05 17:24:54]

Also, the fallback should make life easier for test apps.

 #else
   return GetString16Value(CFSTR("CFBundleShortVersionString"));
 #endif  // defined(OS_IOS)
 }
 
 base::string16 FileVersionInfoMac::file_description() {
   return base::string16();
 }
 
 base::string16 FileVersionInfoMac::legal_trademarks() {
@@ skipping 31 matching lines @@
 base::string16 FileVersionInfoMac::GetString16Value(CFStringRef name) {
   if (bundle_) {
     NSString *ns_name = base::mac::CFToNSCast(name);
     NSString* value = [bundle_ objectForInfoDictionaryKey:ns_name];
     if (value) {
       return base::SysNSStringToUTF16(value);
     }
   }
   return base::string16();
 }