timezone match code - consider canonical id as well

chromeos/chromeos.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'chromeos_sources': [
       'accelerometer/accelerometer_reader.cc',
@@ skipping 415 matching lines @@
       'process_proxy/process_proxy.cc',
       'process_proxy/process_proxy.h',
       'process_proxy/process_proxy_registry.cc',
       'process_proxy/process_proxy_registry.h',
       'settings/cros_settings_names.cc',
       'settings/cros_settings_names.h',
       'settings/cros_settings_provider.cc',
       'settings/cros_settings_provider.h',
       'settings/timezone_settings.cc',
       'settings/timezone_settings.h',
+      'settings/timezone_settings_helper.cc',
+      'settings/timezone_settings_helper.h',
       'system/name_value_pairs_parser.cc',
       'system/name_value_pairs_parser.h',
       'system/statistics_provider.cc',
       'system/statistics_provider.h',
       'system/version_loader.cc',
       'system/version_loader.h',
       'timezone/timezone_provider.cc',
       'timezone/timezone_provider.h',
       'timezone/timezone_request.cc',
       'timezone/timezone_request.h',
@@ skipping 58 matching lines @@
       'network/network_util_unittest.cc',
       'network/onc/onc_certificate_importer_impl_unittest.cc',
       'network/onc/onc_merger_unittest.cc',
       'network/onc/onc_normalizer_unittest.cc',
       'network/onc/onc_translator_unittest.cc',
       'network/onc/onc_utils_unittest.cc',
       'network/onc/onc_validator_unittest.cc',
       'network/shill_property_handler_unittest.cc',
       'process_proxy/process_output_watcher_unittest.cc',
       'process_proxy/process_proxy_unittest.cc',
+      'settings/timezone_settings_unittest.cc',
       'system/name_value_pairs_parser_unittest.cc',
       'system/version_loader_unittest.cc',
       'timezone/timezone_unittest.cc',
       'tpm/tpm_token_info_getter_unittest.cc',
     ],
   },
   'includes': [
     'chromeos_tools.gypi'
   ],
   'targets': [
@@ skipping 133 matching lines @@
         '../build/linux/system.gyp:ssl',
         '../components/components.gyp:onc_component',
         '../crypto/crypto.gyp:crypto',
         '../crypto/crypto.gyp:crypto_test_support',
         '../dbus/dbus.gyp:dbus_test_support',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
         '../url/url.gyp:url_lib',
         'chromeos_test_support',
         'cryptohome_proto',
         'power_manager_proto',
       ],
       'sources': [ '<@(chromeos_test_sources)' ],
       'include_dirs': [
         '..',
       ],
       'conditions': [
@@ skipping 47 matching lines @@
         '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }