Move Mac media glue code from media/video/capture/mac to media/base/mac

media/BUILD.gn

 # Copyright 2014 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/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
@@ skipping 142 matching lines @@
     "video/capture/file_video_capture_device.cc",
     "video/capture/file_video_capture_device.h",
     "video/capture/file_video_capture_device_factory.h",
     "video/capture/file_video_capture_device_factory.cc",
     "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/linux/video_capture_device_chromeos.cc",
     "video/capture/linux/video_capture_device_chromeos.h",
-    "video/capture/mac/avfoundation_glue.h",
-    "video/capture/mac/avfoundation_glue.mm",
-    "video/capture/mac/coremedia_glue.h",
-    "video/capture/mac/coremedia_glue.mm",
     "video/capture/mac/platform_video_capturing_mac.h",
     "video/capture/mac/video_capture_device_avfoundation_mac.h",
     "video/capture/mac/video_capture_device_avfoundation_mac.mm",
     "video/capture/mac/video_capture_device_factory_mac.h",
     "video/capture/mac/video_capture_device_factory_mac.mm",
     "video/capture/mac/video_capture_device_mac.h",
     "video/capture/mac/video_capture_device_mac.mm",
     "video/capture/mac/video_capture_device_qtkit_mac.h",
     "video/capture/mac/video_capture_device_qtkit_mac.mm",
     "video/capture/video_capture_device.cc",
@@ skipping 149 matching lines @@
       "ozone/media_ozone_platform.h",
     ] + get_target_outputs(":generate_ozone_constructor_list")
 
     deps += [
       ":generate_ozone_constructor_list",
       "//ui/ozone",
     ]
   }
 
   if (is_mac) {
+    deps += [
+      "//media/base/mac",
+    ]
     libs += [
       "CoreMIDI.framework",
       "CoreVideo.framework",
       "OpenGL.framework",
       "QTKit.framework",
     ]
   }
 
+  if (is_ios) {
+    deps += [
+      "//media/base/mac",
+    ]
+    libs += [
+      "CoreMedia.framework",

[Robert Sesek, 2014/09/03 21:03:56]

This list doesn't match the one in gyp.

[jfroy, 2014/09/03 21:17:00]

Noted. See my other comment about the iOS changes to the build files.

+      "CoreMIDI.framework",
+      "CoreVideo.framework",
+      "OpenGLES.framework",
+    ]
+  }
+
   if (is_win) {
     libs += [
       "mf.lib",
       "mfplat.lib",
       "mfreadwrite.lib",
       "mfuuid.lib",
     ]
     cflags += [
       "/wd4267"  # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
                  # http://crbug.com/171009
@@ skipping 387 matching lines @@
   java_cpp_template("media_android_imageformat_list") {
     sources = [
       "base/android/java/src/org/chromium/media/ImageFormat.template",
     ]
     inputs = [
       "video/capture/android/imageformat_list.h"
     ]
     package_name = "org/chromium/media"
   }
 }