Clean up Mojo C API dependent targets

media/mojo/services/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("//media/media_options.gni")
 import("//testing/test.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 
 # Target naming conventions:
@@ skipping 54 matching lines @@
     "mojo_renderer_factory.h",
     "mojo_renderer_impl.cc",
     "mojo_renderer_impl.h",
     "mojo_type_trait.h",
     "mojo_video_decoder.cc",
     "mojo_video_decoder.h",
   ]
 
   public_configs = [ ":mojo_media_config" ]
 
-  deps = [
+  public_deps = [

[xhwang, 2016/06/10 19:49:56]

why are these public_deps now?

[Ken Rockot(use gerrit already), 2016/06/10 20:00:41]

Because they're exposed by headers like mojo_decryptor.h

[xhwang, 2016/06/10 20:05:52]

That makes me sad. Having to track what should be in deps and what should be in
public_deps would be a non-trivial task.

If I don't want to do this, I have to restructure all my header files such that
they only expose a pure interface, and always use an internal class in the CC
file to do the real implementation. It's doable but also super annoying.

     "//base",
     "//media",
+    "//media/mojo/interfaces",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/system",
+    "//services/shell/public/interfaces",
+  ]
+
+  deps = [
     "//media/mojo/common",
-    "//media/mojo/interfaces",
     "//mojo/common",
-    "//mojo/public/c/system:for_component",
-    "//services/shell/public/cpp:sources",
-    "//services/shell/public/interfaces",
-    "//ui/gfx/geometry/mojo",
+    "//services/shell/public/cpp",
   ]
 }
 
 component("services") {
   output_name = "media_mojo_services"
 
   sources = [
     "demuxer_stream_provider_shim.cc",
     "demuxer_stream_provider_shim.h",
     "mojo_audio_decoder_service.cc",
@@ skipping 24 matching lines @@
     "service_factory_impl.cc",
     "service_factory_impl.h",
   ]
 
   defines = [ "MEDIA_MOJO_IMPLEMENTATION" ]
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   public_configs = [ ":mojo_media_config" ]
 
-  deps = [
+  public_deps = [
     "//base",
     "//media",
+    "//media/mojo/interfaces",
+    "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/system",
+    "//services/shell/public/cpp",
+    "//url",
+  ]
+
+  deps = [
     "//media:cdm_api",
     "//media:shared_memory_support",
     "//media/mojo/common",
-    "//media/mojo/interfaces",
     "//mojo/common",
-    "//mojo/public/c/system:for_component",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
     "//services/shell/public/interfaces",
-    "//ui/gfx/geometry/mojo",
-    "//url",
   ]
 
   if (is_android) {
     sources += [
       "mojo_provision_fetcher.cc",
       "mojo_provision_fetcher.h",
     ]
   }
 
   if (enable_test_mojo_media_client) {
@@ skipping 17 matching lines @@
 
 mojo_native_application("media") {
   testonly = true
 
   sources = [
     "main.cc",
     "test_mojo_media_client.cc",
     "test_mojo_media_client.h",
   ]
 
-  deps = [
+  public_deps = [
     ":services",
     "//base",
     "//media",
-    "//mojo/public/c/system:for_shared_library",
-    "//services/shell/public/cpp:sources",
+  ]
+
+  deps = [
+    "//mojo/public/c/system",
   ]
 }
 
 mojo_application_manifest("media_manifest") {
   application_name = "media"
   source = "media_manifest.json"
 }
 
 test("media_mojo_shell_unittests") {
   testonly = true
@@ skipping 38 matching lines @@
     ":media",
     ":pipeline_test_manifest",
   ]
 }
 
 mojo_application_manifest("pipeline_test_manifest") {
   application_name = "media_pipeline_integration_unittests"
   type = "exe"
   source = "pipeline_test_manifest.json"
 }