media: Fix gn deps on media/gpu/* targets

media/gpu/BUILD.gn

 # Copyright 2016 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//media/gpu/args.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
@@ skipping 311 matching lines @@
     sources += [
       "dxva_picture_buffer_win.cc",
       "dxva_picture_buffer_win.h",
       "dxva_video_decode_accelerator_win.cc",
       "dxva_video_decode_accelerator_win.h",
     ]
     configs += [
       "//build/config/compiler:no_size_t_to_int_warning",
       "//third_party/khronos:khronos_headers",
     ]
-    deps += [ "//ui/gl" ]
+    deps += [ "//third_party/angle:includes" ]

[jrummell, 2016/05/18 00:03:38]

Note that //ui/gl is already in the deps (line 171).

     libs += [
       "d3d9.lib",
       "d3d11.lib",
       "dxva2.lib",
       "strmiids.lib",
       "mf.lib",
       "mfplat.lib",
       "mfuuid.lib",
     ]
     ldflags += [
@@ skipping 46 matching lines @@
         "//mojo/public/c/system:for_shared_library",
         "//testing/gmock",
         "//ui/android:ui_java",
       ]
     } else {
       sources += [
         "rendering_helper.cc",
         "rendering_helper.h",
         "video_decode_accelerator_unittest.cc",
       ]
+      deps += [
+        "//ui/display",
+        "//ui/display/types",
+        "//ui/platform_window",
+      ]
+      if (use_ozone) {
+        deps += [ "//ui/ozone" ]
+      }
     }
 
     if (is_win) {
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
       deps += [
         "//third_party/angle:libEGL",
         "//third_party/angle:libGLESv2",
       ]
     }
 
-    if (is_chromeos && use_ozone) {
-      deps += [
-        "//ui/display",  # Used by rendering_helper.cc
-        "//ui/ozone",  # Used by rendering_helper.cc
-      ]
-    }
     if (use_x11) {
       configs += [ "//build/config/linux:x11" ]
       deps += [ "//ui/gfx/x" ]
     }
   }
 }
 
 if (is_chromeos || is_mac) {
   test("video_encode_accelerator_unittest") {
     deps = [
@@ skipping 18 matching lines @@
       "video_encode_accelerator_unittest.cc",
     ]
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]
     }
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
     }
   }
 }