[cronet] Make getAcceptLanguages index a static table instead of the application bundle.

components/cronet/ios/Cronet.mm

 // Copyright 2016 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.
 
 #import "components/cronet/ios/Cronet.h"
 
 #include <memory>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 25 matching lines @@
 cronet::URLRequestContextConfig::HttpCacheType gHttpCache =
     cronet::URLRequestContextConfig::HttpCacheType::DISK;
 ScopedVector<cronet::URLRequestContextConfig::QuicHint> gQuicHints;
 NSString* gUserAgent = nil;
 BOOL gUserAgentPartial = NO;
 NSString* gSslKeyLogFileName = nil;
 RequestFilterBlock gRequestFilterBlock = nil;
 std::unique_ptr<CronetHttpProtocolHandlerDelegate> gHttpProtocolHandlerDelegate;
 NSURLCache* gPreservedSharedURLCache = nil;
 BOOL gEnableTestCertVerifierForTesting = FALSE;
+NSString* gAcceptLanguages = nil;
 
 // CertVerifier, which allows any certificates for testing.
 class TestCertVerifier : public net::CertVerifier {
   int Verify(const RequestParams& params,
              net::CRLSet* crl_set,
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
              const net::NetLogWithSource& net_log) override {
     net::Error result = net::OK;
@@ skipping 51 matching lines @@
 
 + (void)configureCronetEnvironmentForTesting:
     (cronet::CronetEnvironment*)cronetEnvironment {
   if (gEnableTestCertVerifierForTesting) {
     std::unique_ptr<TestCertVerifier> test_cert_verifier =
         base::MakeUnique<TestCertVerifier>();
     cronetEnvironment->set_mock_cert_verifier(std::move(test_cert_verifier));
   }
 }
 
++ (NSString*)getAcceptLanguagesFromNSLocale:(NSLocale*)locale {
+  // TODO(lilyhoughton) this is maybe not the best place for this
+  NSDictionary* acceptLangs = @{
+    @"am" : @"am,en-GB,en",
+    @"ar" : @"ar,en-US,en",
+    @"bg" : @"bg-BG,bg",
+    @"bn" : @"bn-IN,bn,en-US,en",
+    @"ca" : @"ca-ES,ca",
+    @"cs" : @"cs-CZ,cs",
+    @"da" : @"da-DK,da,en-US,en",
+    @"de" : @"de-DE,de,en-US,en",
+    @"el" : @"el-GR,el",
+    @"en-GB" : @"en-GB,en-US,en",
+    @"en" : @"en-US,en",
+    @"es-419 " : @"es-419,es",
+    @"es" : @"es-ES,es",
+    @"fa" : @"fa,en-US,en",
+    @"fi" : @"fi-FI,fi,en-US,en",
+    @"fil" : @"fil,fil-PH,tl,en-US,en",
+    @"fr" : @"fr-FR,fr,en-US,en",
+    @"gu" : @"gu-IN,gu,hi-IN,hi,en-US,en",
+    @"he" : @"he-IL,he,en-US,en",
+    @"hi" : @"hi-IN,hi,en-US,en",
+    @"hr" : @"hr-HR,hr,en-US,en",
+    @"hu" : @"hu-HU,hu,en-US,en",
+    @"id" : @"id-ID,id,en-US,en",
+    @"it" : @"it-IT,it,en-US,en",
+    @"ja" : @"ja,en-US,en",
+    @"kn" : @"kn-IN,kn,en-US,en",
+    @"ko" : @"ko-KR,ko,en-US,en",
+    @"lt" : @"lt,en-US,en,ru,pl",
+    @"lv" : @"lv-LV,lv,en-US,en",
+    @"ml" : @"ml-IN,ml,en-US,en",
+    @"mr" : @"mr-IN,mr,hi-IN,hi,en-US,en",
+    @"ms" : @"ms,en-US,en",
+    @"nb" : @"nb-NO,nb,no,nn,en-US,en",
+    @"nl" : @"nl-NL,nl,en-US,en",
+    @"pl" : @"pl-PL,pl,en-US,en",
+    @"pt-BR" : @"pt-BR,pt,en-US,en",
+    @"pt-PT" : @"pt-PT,pt,en-US,en",
+    @"pt" : @"pt-PT,pt,en-US,en",
+    @"ro" : @"ro-RO,ro,en-US,en",
+    @"ru" : @"ru-RU,ru,en-US,en",
+    @"sk" : @"sk-SK,sk,cs,en-US,en",
+    @"sl" : @"sl-SI,sl,en-GB,en",
+    @"sr" : @"sr-RS,sr,en-US,en",
+    @"sv" : @"sv-SE,sv,en-US,en",
+    @"sw" : @"sw,en-GB,en",
+    @"ta" : @"ta-IN,ta,en-US,en",
+    @"te" : @"te-IN,te,hi-IN,hi,en-US,en",
+    @"th" : @"th-TH,th",
+    @"tr" : @"tr-TR,tr,en-US,en",
+    @"uk" : @"uk-UA,uk,ru,en-US,en",
+    @"vi" : @"vi-VN,vi,fr-FR,fr,en-US,en",
+    @"zh-Hans" : @"zh-CN,zh",
+    @"zh-Hant" : @"zh-TW,zh,en-US,en",
+    @"zh" : @"zh-CN,zh",
+  };
+
+  // TODO(lilyhoughton) reasonably sure this is wrong
+  NSString* region = [NSString
+      stringWithFormat:@"%@-%@", [locale languageCode], [locale countryCode]];
+  NSString* lang = [locale languageCode];
+  NSString* acceptLanguages =
+      acceptLangs[region] ?: acceptLangs[lang] ?: @"en-US,en";
+  return acceptLanguages;
+}
+
 + (NSString*)getAcceptLanguages {
-  // Use the framework bundle to search for resources.
-  NSBundle* frameworkBundle = [NSBundle bundleForClass:self];
-  NSString* bundlePath =
-      [frameworkBundle pathForResource:@"cronet_resources" ofType:@"bundle"];
-  NSBundle* bundle = [NSBundle bundleWithPath:bundlePath];
-  NSString* acceptLanguages = NSLocalizedStringWithDefaultValue(
-      @"IDS_ACCEPT_LANGUAGES", @"Localizable", bundle, @"en-US,en",
-      @"These values are copied from Chrome's .xtb files, so the same "
-       "values are used in the |Accept-Language| header. Key name matches "
-       "Chrome's.");
-  if (acceptLanguages == Nil)
-    acceptLanguages = @"";
-  return acceptLanguages;
+  return [self getAcceptLanguagesFromNSLocale:[NSLocale currentLocale]];
+}
+
++ (void)setAcceptLanguages:(NSString*)acceptLanguages {

[robgaunt, 2017/02/03 18:42:44]

[self checkNotStarted];

+  gAcceptLanguages = acceptLanguages;
 }
 
 + (void)checkNotStarted {
   CHECK(gChromeNet == NULL) << "Cronet is already started.";
 }
 
 + (void)setHttp2Enabled:(BOOL)http2Enabled {
   [self checkNotStarted];
   gHttp2Enabled = http2Enabled;
 }
@@ skipping 42 matching lines @@
     gHttpProtocolHandlerDelegate.get()->SetRequestFilterBlock(block);
   else
     gRequestFilterBlock = block;
 }
 
 + (void)startInternal {
   cronet::CronetEnvironment::Initialize();
   std::string user_agent = base::SysNSStringToUTF8(gUserAgent);
   gChromeNet.Get().reset(
       new cronet::CronetEnvironment(user_agent, gUserAgentPartial));
-  gChromeNet.Get()->set_accept_language(
-      base::SysNSStringToUTF8([self getAcceptLanguages]));
+  gChromeNet.Get()->set_accept_language(base::SysNSStringToUTF8(
+      gAcceptLanguages ? gAcceptLanguages : [self getAcceptLanguages]));

[robgaunt, 2017/02/03 18:42:44]

gAcceptLanguages ?: [self getAcceptLanguages]

 
   gChromeNet.Get()->set_http2_enabled(gHttp2Enabled);
   gChromeNet.Get()->set_quic_enabled(gQuicEnabled);
   gChromeNet.Get()->set_http_cache(gHttpCache);
   gChromeNet.Get()->set_ssl_key_log_file_name(
       base::SysNSStringToUTF8(gSslKeyLogFileName));
   for (const auto* quicHint : gQuicHints) {
     gChromeNet.Get()->AddQuicHint(quicHint->host, quicHint->port,
                                   quicHint->alternate_port);
   }
@@ skipping 105 matching lines @@
       base::SysNSStringToUTF8(hostResolverRulesForTesting));
 }
 
 // This is a non-public dummy method that prevents the linker from stripping out
 // the otherwise non-referenced methods from 'bidirectional_stream.cc'.
 + (void)preventStrippingCronetBidirectionalStream {
   bidirectional_stream_create(NULL, 0, 0);
 }
 
 @end