Update iOS UA generation for iOS 7

webkit/common/user_agent/user_agent_util_ios.mm

 // Copyright 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 "webkit/common/user_agent/user_agent_util.h"
 
 #import <UIKit/UIKit.h>
 
 #include <sys/sysctl.h>
 #include <string>
@@ skipping 15 matching lines @@
   int32 major_os_version;
   int32 minor_os_version;
   UAVersions ua_versions;
 };
 
 const UAVersions& GetUAVersionsForCurrentOS() {
   // The WebKit version can be extracted dynamically from UIWebView, but the
   // Safari version can't be, so a lookup table is used instead (for both, since
   // the reported versions should stay in sync).
   static const OSVersionMap version_map[] = {
-    { 6, 0, { "8536.25",   "536.26" } },  // TODO(ios): Update for 6.0 final.
+    // TODO(stuartmorgan): Update for 7.0 final if necessary.
+    { 7, 0, { "8536.25",   "537.51.1" } },
+    // 6.1 has the same values as 6.0.
+    { 6, 0, { "8536.25",   "536.26" } },
     // 5.1 has the same values as 5.0.
     { 5, 0, { "7534.48.3", "534.46" } },
-    { 4, 3, { "6533.18.5", "533.17.9" } },
   };
 
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
 
   // Return the versions corresponding to the first (and thus highest) OS
@@ skipping 43 matching lines @@
 
   std::string os_cpu;
   base::StringAppendF(
       &os_cpu,
       "%s;%s CPU %sOS %s like Mac OS X",
       platform.c_str(),
       (os_major_version < 5) ? " U;" : "",  // iOS < 5 has a "U;" in the UA.
       (platform == "iPad") ? "" : "iPhone ",  // iPad has an empty string here.
       os_version.c_str());
 
-  // Up until iOS 5, the locale was included at the end of the Safari UA.
-  // TODO(stuartmorgan): Remove this once iOS 4.3 is no longer supported.
-  if (os_major_version < 5) {
-    // The locale string is not easy to set correctly. Safari uses a language
-    // code and a dialect code. However, there is no setting allowing the user
-    // to set the dialect code, and no API to retrieve it.
-    // Note: The NSLocale methods (currentIdentifier:,
-    // objectForKey:NSLocaleLanguageCode and objectForKey:NSLocaleCountryCode)
-    // are not useful here because they return information related to the
-    // "Region Format" setting, which is different from the "Language" setting.
-    base::scoped_nsobject<NSDictionary> dialects([[NSDictionary alloc]
-        initWithObjectsAndKeys:
-            @"ar",    @"ar",  // No dialect code in Safari.
-            @"ca-es", @"ca",
-            @"cs-cz", @"cs",
-            @"da-dk", @"da",
-            @"el-gr", @"el",
-            @"en-gb", @"en-GB",
-            @"en-us", @"en",
-            @"he-il", @"he",
-            @"id",    @"id",  // No dialect code in Safari.
-            @"ja-jp", @"ja",
-            @"ko-kr", @"ko",
-            @"nb-no", @"nb",
-            @"pt-br", @"pt",
-            @"pt-pt", @"pt-PT",
-            @"sv-se", @"sv",
-            @"uk-ua", @"uk",
-            @"vi-vn", @"vi",
-            @"zh-cn", @"zh-Hans",
-            @"zh-tw", @"zh-Hant",
-            nil]);
-
-    NSArray* preferredLanguages = [NSLocale preferredLanguages];
-    NSString* language = ([preferredLanguages count] > 0) ?
-        [preferredLanguages objectAtIndex:0] : @"en";
-    NSString* localeIdentifier = [dialects objectForKey:language];
-    if (!localeIdentifier) {
-      // No entry in the dictionary, so duplicate the language string.
-      localeIdentifier =
-          [NSString stringWithFormat:@"%@-%@", language, language];
-    }
-
-    base::StringAppendF(&os_cpu, "; %s",
-                        base::SysNSStringToUTF8(localeIdentifier).c_str());
-  }
-
   return os_cpu;
 }
 
 std::string BuildUserAgentFromProduct(const std::string& product) {
   // Retrieve the kernel build number.
   int mib[2] = {CTL_KERN, KERN_OSVERSION};
   unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
   size_t bufferSize = 0;
   sysctl(mib, namelen, NULL, &bufferSize, NULL, 0);
   char kernel_version[bufferSize];
@@ skipping 10 matching lines @@
       webkit_glue::BuildOSCpuInfo().c_str(),
       ua_versions.webkit_version_string,
       product.c_str(),
       kernel_version,
       ua_versions.safari_version_string);
 
   return user_agent;
 }
 
 }  // namespace webkit_glue