| Index: webrtc/test/BUILD.gn
 | 
| diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
 | 
| index 809274f7b741f7ce58e911504c2f695ad01b9c13..22f890b64fbf53d63f3042d4fb7df424dd3183b7 100644
 | 
| --- a/webrtc/test/BUILD.gn
 | 
| +++ b/webrtc/test/BUILD.gn
 | 
| @@ -104,19 +104,28 @@ rtc_source_set("test_main") {
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| +rtc_source_set("fileutils") {
 | 
| +  testonly = true
 | 
| +  sources = [
 | 
| +    "testsupport/fileutils.cc",
 | 
| +    "testsupport/fileutils.h",
 | 
| +  ]
 | 
| +  if (is_ios) {
 | 
| +    sources += [ "testsupport/iosfileutils.mm" ]
 | 
| +    configs += [ "//build/config/compiler:enable_arc" ]
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  rtc_source_set("test_support") {
 | 
|    testonly = true
 | 
|  
 | 
|    sources = [
 | 
|      "gmock.h",
 | 
|      "gtest.h",
 | 
| -    "testsupport/fileutils.cc",
 | 
| -    "testsupport/fileutils.h",
 | 
|      "testsupport/frame_reader.cc",
 | 
|      "testsupport/frame_reader.h",
 | 
|      "testsupport/frame_writer.cc",
 | 
|      "testsupport/frame_writer.h",
 | 
| -    "testsupport/iosfileutils.mm",
 | 
|      "testsupport/metrics/video_metrics.cc",
 | 
|      "testsupport/metrics/video_metrics.h",
 | 
|      "testsupport/mock/mock_frame_reader.h",
 | 
| @@ -139,15 +148,15 @@ rtc_source_set("test_support") {
 | 
|      "//testing/gtest",
 | 
|    ]
 | 
|  
 | 
| +  public_deps = [
 | 
| +    ":fileutils",
 | 
| +  ]
 | 
| +
 | 
|    if (!build_with_chromium && is_clang) {
 | 
|      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
 | 
|      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
 | 
|    }
 | 
|  
 | 
| -  if (is_ios) {
 | 
| -    configs += [ "//build/config/compiler:enable_arc" ]
 | 
| -  }
 | 
| -
 | 
|    if (is_android) {
 | 
|      deps += [ "//base:base" ]
 | 
|      data = [
 | 
| @@ -200,7 +209,6 @@ rtc_test("test_support_unittests") {
 | 
|      "rtp_file_reader_unittest.cc",
 | 
|      "rtp_file_writer_unittest.cc",
 | 
|      "testsupport/always_passing_unittest.cc",
 | 
| -    "testsupport/fileutils_unittest.cc",
 | 
|      "testsupport/frame_reader_unittest.cc",
 | 
|      "testsupport/frame_writer_unittest.cc",
 | 
|      "testsupport/metrics/video_metrics_unittest.cc",
 | 
| @@ -232,6 +240,7 @@ rtc_test("test_support_unittests") {
 | 
|    }
 | 
|  
 | 
|    deps += [
 | 
| +    ":fileutils_unittests",
 | 
|      ":test_common",
 | 
|      ":test_main",
 | 
|      "../modules/video_capture",
 | 
| @@ -239,6 +248,17 @@ rtc_test("test_support_unittests") {
 | 
|      "//testing/gtest",
 | 
|    ]
 | 
|  }
 | 
| +rtc_source_set("fileutils_unittests") {
 | 
| +  testonly = true
 | 
| +  sources = [
 | 
| +    "testsupport/fileutils_unittest.cc",
 | 
| +  ]
 | 
| +  deps = [
 | 
| +    ":fileutils",
 | 
| +    "//testing/gmock",
 | 
| +    "//testing/gtest",
 | 
| +  ]
 | 
| +}
 | 
|  
 | 
|  rtc_source_set("test_common") {
 | 
|    testonly = true
 | 
| 
 |