Refactor + enable GN check on video_coding_utility

webrtc/modules/video_coding/BUILD.gn

Index: webrtc/modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 6399ebdf6b403b92d416f4b41d473a5942aa43ab..f254db5e45d37da2d330cd25961756be955022ee 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -71,6 +71,8 @@ rtc_static_library("video_coding") {
     "timestamp_map.h",
     "timing.cc",
     "timing.h",
+    "utility/qp_parser.cc",

[brandtr, 2017/03/08 10:37:14]

Move to ..?

[kjellander_webrtc, 2017/03/08 11:16:18]

Done.

+    "utility/qp_parser.h",
     "video_codec_initializer.cc",
     "video_coding_impl.cc",
     "video_coding_impl.h",
@@ -105,10 +107,6 @@ rtc_static_library("video_coding") {
 }
 
 rtc_static_library("video_coding_utility") {
-  # TODO(ehmaldonado): Remove (bugs.webrtc.org/6828)
-  # Errors on cyclic dependency with :video_coding if enabled.
-  check_includes = false
-
   sources = [
     "utility/default_video_bitrate_allocator.cc",
     "utility/default_video_bitrate_allocator.h",
@@ -118,12 +116,8 @@ rtc_static_library("video_coding_utility") {
     "utility/ivf_file_writer.h",
     "utility/moving_average.cc",
     "utility/moving_average.h",
-    "utility/qp_parser.cc",
-    "utility/qp_parser.h",
     "utility/quality_scaler.cc",
     "utility/quality_scaler.h",
-    "utility/simulcast_rate_allocator.cc",
-    "utility/simulcast_rate_allocator.h",
     "utility/vp8_header_parser.cc",
     "utility/vp8_header_parser.h",
   ]
@@ -137,7 +131,9 @@ rtc_static_library("video_coding_utility") {
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../base:rtc_numerics",
+    "../../base:rtc_task_queue",
     "../../common_video",
+    "../../modules/rtp_rtcp:rtp_rtcp",
     "../../system_wrappers",
   ]
 }
@@ -225,6 +221,8 @@ rtc_static_library("webrtc_vp8") {
     "codecs/vp8/temporal_layers.h",
     "codecs/vp8/vp8_impl.cc",
     "codecs/vp8/vp8_impl.h",
+    "utility/simulcast_rate_allocator.cc",

[brandtr, 2017/03/08 10:37:14]

Move to codecs/vp8?

[kjellander_webrtc, 2017/03/08 11:16:18]

Done.

+    "utility/simulcast_rate_allocator.h",
   ]
 
   # TODO(jschuh): Bug 1348: fix this warning.
@@ -332,6 +330,7 @@ if (rtc_include_tests) {
     deps = [
       ":video_coding",
       ":video_coding_utility",
+      ":webrtc_vp8",
       "../..:webrtc_common",
       "../../base:rtc_base_approved",
       "../../common_video:common_video",