Remove the is_ensemble build variable from the GN files.

This reverts https://codereview.chromium.org/914363002 completely.
Some of the changes have already been reverted in
https://codereview.chromium.org/1008683002.

R=dalecurtis@chromium.org
BUG=457280

Review URL: https://codereview.chromium.org/1098503002

Cr-Commit-Position: refs/heads/master@{#325517}

3 files changed, 16 insertions, 30 deletions

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 9914df2..db96432 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -210,8 +210,14 @@ component("media") {
     "renderers/renderer_impl.h",
     "renderers/video_renderer_impl.cc",
     "renderers/video_renderer_impl.h",
+    "video/capture/fake_video_capture_device.cc",
+    "video/capture/fake_video_capture_device.h",
+    "video/capture/fake_video_capture_device_factory.cc",
+    "video/capture/fake_video_capture_device_factory.h",
     "video/capture/file_video_capture_device.cc",
     "video/capture/file_video_capture_device.h",
+    "video/capture/file_video_capture_device_factory.cc",
+    "video/capture/file_video_capture_device_factory.h",
     "video/capture/linux/v4l2_capture_delegate.cc",
     "video/capture/linux/v4l2_capture_delegate.h",
     "video/capture/linux/v4l2_capture_delegate_multi_plane.cc",
@@ -220,6 +226,8 @@ component("media") {
     "video/capture/linux/v4l2_capture_delegate_single_plane.h",
     "video/capture/linux/video_capture_device_chromeos.cc",
     "video/capture/linux/video_capture_device_chromeos.h",
+    "video/capture/linux/video_capture_device_factory_linux.cc",
+    "video/capture/linux/video_capture_device_factory_linux.h",
     "video/capture/linux/video_capture_device_linux.cc",
     "video/capture/linux/video_capture_device_linux.h",
     "video/capture/mac/platform_video_capturing_mac.h",
@@ -235,6 +243,8 @@ component("media") {
     "video/capture/mac/video_capture_device_qtkit_mac.mm",
     "video/capture/video_capture_device.cc",
     "video/capture/video_capture_device.h",
+    "video/capture/video_capture_device_factory.cc",
+    "video/capture/video_capture_device_factory.h",
     "video/capture/video_capture_device_info.cc",
     "video/capture/video_capture_device_info.h",
     "video/capture/win/capability_list_win.cc",
@@ -497,30 +507,11 @@ component("media") {
     "//skia",
     "//third_party/libyuv",
     "//third_party/opus",
+    "//ui/events:events_base",
+    "//ui/gfx",
     "//ui/gfx/geometry",
     "//url",
   ]
-
-  # Add the sources and dependencies that need the X11 or fontconfig libraries.
-  if (!is_ensemble) {
-    sources += [
-      "video/capture/fake_video_capture_device.cc",
-      "video/capture/fake_video_capture_device.h",
-      "video/capture/fake_video_capture_device_factory.cc",
-      "video/capture/fake_video_capture_device_factory.h",
-      "video/capture/file_video_capture_device_factory.cc",
-      "video/capture/file_video_capture_device_factory.h",
-      "video/capture/linux/video_capture_device_factory_linux.cc",
-      "video/capture/linux/video_capture_device_factory_linux.h",
-      "video/capture/video_capture_device_factory.cc",
-      "video/capture/video_capture_device_factory.h",
-    ]
-
-    deps += [
-      "//ui/events:events_base",
-      "//ui/gfx",
-    ]
-  }
 }
 
 # Minimal media component for media/cast on iOS.
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 64c5b13..5a6f941 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -187,14 +187,12 @@ source_set("base") {
     "yuv_convert.h",
   ]
   defines = []
-  deps = []
+  deps = [
+    "//skia",
+  ]
   libs = []
   configs += [ "//media:media_config" ]
 
-  if (!is_ensemble) {
-    deps += [ "//skia" ]
-  }
-
   if (media_use_ffmpeg) {
     sources += [
       "audio_video_metadata_extractor.cc",
@@ -224,7 +222,7 @@ source_set("base") {
     sources += [ "media_posix.cc" ]
   }
 
-  if (is_linux && use_x11 && !is_ensemble) {
+  if (is_linux && use_x11) {
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xext",
diff --git a/media/media_options.gni b/media/media_options.gni
index f8b1646..9ac7c5e 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni
@@ -54,7 +54,4 @@ declare_args() {
 
   # TODO(GYP): This should be a platform define.
   is_openbsd = false
-
-  # Override to omit code that depends on the X11 and fontconfig libraries.
-  is_ensemble = false
 }