Make cld2_table_size configurable in GN builds

build/config/features.gni

 # 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.
 
 # This file contains Chrome-feature-related build flags (see ui.gni for
 # UI-related ones). These should theoretically be moved to the build files of
 # the features themselves.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global to match the GYP configuration. Also,
 # anything that needs a grit define must be in either this file or ui.gni.
 #
 # PLEASE TRY TO AVOID ADDING FLAGS TO THIS FILE in cases where grit isn't
 # required. See the declare_args block of BUILDCONFIG.gn for advice on how
 # to set up feature flags.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 declare_args() {
+  if (is_android || is_ios) {

[brettw, 2015/10/01 17:24:22]

I notice this is only used in third_party/cld_2/BUILD.gn now. We can just move
this block (enclosed by declare_args()) to that file so it's not global any
more, which will help clean this up.

[Tomasz Moniuszko, 2015/10/02 07:56:41]

Done. It seems that there was another cld2_table_size=2 assignment in
third_party/cld_2/BUILD.gn already. I removed it because it would overwrite the
default values. Now cld2_table_size is defined like in GYP version: 0 on Android
and iOS, 2 on other platforms.

+    cld2_table_size = 0  # Small, accurate tables
+  } else {
+    cld2_table_size = 2  # Larger, more accurate tables
+  }
+
   # Multicast DNS.
   enable_mdns = is_win || is_linux
 
   enable_plugins = (!is_android && !is_ios) || is_chromecast
   enable_pdf = !is_android && !is_ios && !is_chromecast
 
   # Enables Native Client support.
   # TODO(GYP): Get NaCl linking on other platforms.
   # Also, see if we can always get rid of enable_nacl_untrusted and
   # enable_pnacl and always build them if enable_nacl is true.
@@ skipping 84 matching lines @@
   fieldtrial_testing_like_official_build = is_chrome_branded
 }
 
 # Additional dependent variables -----------------------------------------------
 
 # Set the version of CLD.
 #   1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1.
 #   2: Use only CLD2.
 cld_version = 2
 
-if (is_android || is_ios) {
-  cld2_table_size = 0  # Small, accurate tables
-} else {
-  cld2_table_size = 2  # Larger, more accurate tables
-}
-
 # libudev usage. This currently only affects the content layer.
 use_udev = is_linux && !is_chromecast
 
 # Enable the spell checker.
 enable_spellcheck = !is_ios
 
 # Use the operating system's spellchecker rather than hunspell.
 use_browser_spellchecker = is_android || is_mac
 
 # Enable basic printing support and UI.
@@ skipping 60 matching lines @@
 # Option controlling the use of GConf (the classic GNOME configuration
 # system).
 use_gconf = is_linux && !is_chromeos && !is_chromecast
 
 # Whether to back up data before sync.
 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
 
 # Enable WebVR support by default on Android
 # Still requires command line flag to access API
 enable_webvr = is_android