Remove net & url small, iOS ICU alternatives, unit tests.

components/cronet.gypi

 # Copyright 2014 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.
 
 {
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'cronet_jni_headers',
@@ skipping 158 matching lines @@
               ],
               'includes': [
                 '../build/util/version.gypi',
               ],
             },
           ],
         },
         {
           # cronet_static_small target has reduced binary size through using
           # ICU alternatives which requires file and ftp support be disabled.
           'target_name': 'cronet_static_small',

[mef, 2016/04/01 20:42:49]

do we still need cronet_static_small vs cronet_static?

[kapishnikov, 2016/04/04 20:17:26]

cronet_static_small depends on
components/components.gyp:data_reduction_proxy_core_browser_small, which does
not depend on third_party/leveldatabase/leveldatabase.gyp:leveldatabase. That is
in contrast to data_reduction_proxy_core_browser target that depends on
leveldatabase. We could introduce a new disable_leveldatabase flag but to make
it easier let's keep this target for now.

           'type': 'static_library',
           'defines': [
-            'USE_ICU_ALTERNATIVES_ON_ANDROID=1',
+            'USE_PLATFORM_ICU_ALTERNATIVES=1',

[mef, 2016/04/01 20:42:49]

should this be conditioned on 'use_platform_icu_alternatives' flag?

[kapishnikov, 2016/04/04 20:17:26]

Done. Actually removed USE_PLATFORM_ICU_ALTERNATIVES, DISABLE_FILE_SUPPORT and
DISABLE_FTP_SUPPORT defines from here since they are defined in common.gypi.

             'DISABLE_FILE_SUPPORT=1',
             'DISABLE_FTP_SUPPORT=1',
           ],
           'dependencies': [
-            '../net/net.gyp:net_small',
-            '../url/url.gyp:url_lib_use_icu_alternatives_on_android',
+            '../net/net.gyp:net',
+            '../url/url.gyp:url_lib',
           ],
           'conditions': [
             ['enable_data_reduction_proxy_support==1',
               {
                 'dependencies': [
                   '../components/components.gyp:data_reduction_proxy_core_browser_small',
                 ],
               },
             ],
           ],
@@ skipping 21 matching lines @@
         },
         {
           'target_name': 'libcronet',
           'type': 'shared_library',
           'sources': [
             'cronet/android/cronet_jni.cc',
           ],
           'dependencies': [
             'cronet_static_small',
             '../base/base.gyp:base',
-            '../net/net.gyp:net_small',
+            '../net/net.gyp:net',
           ],
           'ldflags': [
             '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/components/cronet/android/only_jni_exports.lst',
           ],
           'variables': {
             # libcronet doesn't really use native JNI exports, but it does use
             # its own linker version script. The ARM64 linker appears to not
             # work with multiple version scripts with anonymous version tags,
             # so enable use_native_jni_exports which avoids adding another
             # version sript (android_no_jni_exports.lst) so we don't run afoul
@@ skipping 485 matching lines @@
             },
           ],
         },
       ],
       'variables': {
         'enable_data_reduction_proxy_support%': 0,
       },
     }],  # OS=="android"
   ],
 }