[Media Router] Move media_router.mojom to c/b/media/router/mojo

chrome/browser/media/router/media_router.gyp

 # Copyright 2015 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.
 
 {
   'includes': [
     'media_router.gypi',
   ],
   'targets': [
     {
       # GN version: //chrome/browser/media/router:router
       'target_name': 'media_router',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)',
       ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
         '<(DEPTH)/components/components.gyp:keyed_service_content',
         '<(DEPTH)/components/components.gyp:keyed_service_core',
-        '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/url/url.gyp:url_lib',
+        '<(DEPTH)/content/content.gyp:content_browser',

[Wez, 2016/04/04 23:33:48]

nit: Ordering; this should appear after keyed_service_core?

       ],
       'sources': [
         '<@(media_router_sources)',
       ],
       'conditions': [
         [ 'OS!="android" and OS!="ios"', {
           'dependencies': [
             # media_router_type_converters.h needs the generated file.
             'media_router_mojo_gen',
             'media_router_mojo',
             '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
           ],
           'sources': [
             '<@(media_router_non_android_sources)',
           ]
         }],
       ]
     },
     {
       # Mojo compiler for the Media Router internal API.
       'target_name': 'media_router_mojo_gen',
       'type': 'none',
       'sources': [
-        'media_router.mojom',
+        'mojo/media_router.mojom',
       ],
       'includes': [
         '../../../../mojo/mojom_bindings_generator.gypi',
       ],
     },
     {
       'target_name': 'media_router_mojo',
       'type': 'static_library',
       'dependencies': [
         'media_router_mojo_gen',
       ],
       'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.mojom.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.mojom.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/mojo/media_router.mojom.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/mojo/media_router.mojom.h',
       ],
     },
     {
       # GN version: //chrome/browser/media/router:test_support
       'target_name': 'media_router_test_support',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)',
       ],
       'dependencies': [
@@ skipping 12 matching lines @@
             '<(DEPTH)/extensions/extensions.gyp:extensions_common',
           ],
           'sources': [
             '<@(media_router_non_android_test_support_sources)',
           ]
         }],
       ]
     },
   ],
 }