Improving the fake clock and using it to fix a flaky STUN timeout test.

webrtc/base/base_tests.gyp

 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
   'includes': [ '../build/common.gypi', ],
   'targets': [
     {
       'target_name': 'rtc_base_tests_utils',
       'type': 'static_library',
       'sources': [
         'unittest_main.cc',
         # Also use this as a convenient dumping ground for misc files that are
         # included by multiple targets below.
+        'fakeclock.cc',
+        'fakeclock.h',
         'fakenetwork.h',
         'fakesslidentity.h',
         'faketaskrunner.h',
         'gunit.h',
         'testbase64.h',
         'testechoserver.h',
         'testutils.h',
+        'timedelta.h',
       ],
       'defines': [
         'GTEST_RELATIVE_PATH',
       ],
       'dependencies': [
         'base.gyp:rtc_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(webrtc_root)/test/test.gyp:field_trial',
       ],
       'direct_dependent_settings': {
@@ skipping 22 matching lines @@
           'bufferqueue_unittest.cc',
           'bytebuffer_unittest.cc',
           'byteorder_unittest.cc',
           'callback_unittest.cc',
           'copyonwritebuffer_unittest.cc',
           'crc32_unittest.cc',
           'criticalsection_unittest.cc',
           'event_tracer_unittest.cc',
           'event_unittest.cc',
           'exp_filter_unittest.cc',
-          'fakeclock.cc',
-          'fakeclock.h',
           'filerotatingstream_unittest.cc',
           'fileutils_unittest.cc',
           'helpers_unittest.cc',
           'httpbase_unittest.cc',
           'httpcommon_unittest.cc',
           'httpserver_unittest.cc',
           'ipaddress_unittest.cc',
           'logging_unittest.cc',
           'md5digest_unittest.cc',
           'messagedigest_unittest.cc',
@@ skipping 29 matching lines @@
           'stringencode_unittest.cc',
           'stringutils_unittest.cc',
           'swap_queue_unittest.cc',
           # TODO(ronghuawu): Reenable this test.
           # 'systeminfo_unittest.cc',
           'task_queue_unittest.cc',
           'task_unittest.cc',
           'testclient_unittest.cc',
           'thread_checker_unittest.cc',
           'thread_unittest.cc',
-          'timedelta.h',
           'timeutils_unittest.cc',
           'urlencode_unittest.cc',
           'versionparsing_unittest.cc',
           # TODO(ronghuawu): Reenable this test.
           # 'windowpicker_unittest.cc',
         ],
         'conditions': [
           ['OS=="linux"', {
             'sources': [
               'latebindingsymboltable_unittest.cc',
@@ skipping 43 matching lines @@
           ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
             'defines': [
               'CARBON_DEPRECATED=YES',
             ],
           }],
         ],  # conditions
       },
     },
   ],
 }