Drop Cronet support for iOS 9

Bug: 1101179
Change-Id: I4c4bad5bede356bd34601c3972beefa935c77719
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2286474Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Panos Astithas <pastithas@google.com>
Cr-Commit-Position: refs/heads/master@{#786871}

components/cronet/ios/cronet_metrics.mm

@@ -329,21 +329,17 @@ std::unique_ptr<Metrics> CronetMetricsDelegate::MetricsForTask(
 }
 
 void CronetMetricsDelegate::OnStartNetRequest(NSURLSessionTask* task) {
-  if (@available(iOS 10, *)) {
-    base::AutoLock auto_lock(gTaskMetricsMapLock.Get());
-    if ([task state] == NSURLSessionTaskStateRunning) {
-      gTaskMetricsMap.Get()[task] = nullptr;
-    }
+  base::AutoLock auto_lock(gTaskMetricsMapLock.Get());
+  if ([task state] == NSURLSessionTaskStateRunning) {
+    gTaskMetricsMap.Get()[task] = nullptr;
   }
 }
 
 void CronetMetricsDelegate::OnStopNetRequest(std::unique_ptr<Metrics> metrics) {
-  if (@available(iOS 10, *)) {
-    base::AutoLock auto_lock(gTaskMetricsMapLock.Get());
-    auto metrics_search = gTaskMetricsMap.Get().find(metrics->task);
-    if (metrics_search != gTaskMetricsMap.Get().end())
-      metrics_search->second = std::move(metrics);
-  }
+  base::AutoLock auto_lock(gTaskMetricsMapLock.Get());
+  auto metrics_search = gTaskMetricsMap.Get().find(metrics->task);
+  if (metrics_search != gTaskMetricsMap.Get().end())
+    metrics_search->second = std::move(metrics);
 }
 
 size_t CronetMetricsDelegate::GetMetricsMapSize() {

components/cronet/tools/cr_cronet.py

@@ -123,7 +123,7 @@ def get_ios_gn_args(is_release, bundle_id_prefix, target_cpu):
       'enable_remoting=false '
       'use_xcode_clang=false '
       'ios_app_bundle_id_prefix="%s" '
-      'ios_deployment_target="9.0" '
+      'ios_deployment_target="10.0" '
       'enable_dsyms=true '
       'target_cpu="%s" ') % (bundle_id_prefix, target_cpu)
 

tools/mb/mb_config.pyl

@@ -1955,7 +1955,7 @@
 
     'ios_cronet': [
       'additional_target_cpus_x86', 'cronet_ios', 'debug_static_bot',
-      'ios_deployment_target_9_0', 'ios_simulator'
+      'ios_deployment_target_10_0', 'ios_simulator'
     ],
 
     'ios_device_release_compile_only': [
@@ -2701,8 +2701,8 @@
       'gn_args': 'ios_code_signing_identity_description=\"iPhone Developer\"',
     },
 
-    'ios_deployment_target_9_0': {
-      'gn_args': 'ios_deployment_target=\"9.0\"',
+    'ios_deployment_target_10_0': {
+      'gn_args': 'ios_deployment_target=\"10.0\"',
     },
 
     'ios_device': {