Reorganizes Chromecast code to better reflect functional dependencies.

chromecast/chromecast.gyp

Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index 7ca308a435f02feb8c5315d349bdd72b17e88c4e..7485fad87b8d33efef284d09c6483e4583f56717 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -14,91 +14,6 @@
   },
   'targets': [
     {
-      'target_name': 'cast_common',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'common/cast_paths.cc',
-        'common/cast_paths.h',
-        'common/cast_resource_delegate.cc',
-        'common/cast_resource_delegate.h',
-        'common/chromecast_config.cc',
-        'common/chromecast_config.h',
-        'common/chromecast_switches.cc',
-        'common/chromecast_switches.h',
-        'common/pref_names.cc',
-        'common/pref_names.h',
-      ],
-      'conditions': [
-        ['chromecast_branding=="Chrome"', {
-          'dependencies': [
-            'internal/chromecast_internal.gyp:cast_common_internal',
-          ],
-        }, {
-          'sources': [
-            'common/chromecast_config_simple.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'cast_metrics',
-      'type': '<(component)',
-      'dependencies': [
-        'cast_common',
-        '../components/components.gyp:component_metrics_proto',
-        '../components/components.gyp:metrics',
-        '../components/components.gyp:metrics_gpu',
-        '../components/components.gyp:metrics_net',
-        '../components/components.gyp:metrics_profiler',
-        '../content/content.gyp:content',
-      ],
-      'sources': [
-        'metrics/cast_metrics_prefs.cc',
-        'metrics/cast_metrics_prefs.h',
-        'metrics/cast_metrics_service_client.cc',
-        'metrics/cast_metrics_service_client.h',
-        'metrics/cast_stability_metrics_provider.cc',
-        'metrics/cast_stability_metrics_provider.h',
-        'metrics/platform_metrics_providers.h',
-      ],
-      'conditions': [
-        ['chromecast_branding=="Chrome"', {
-          'dependencies': [
-            '<(cast_internal_gyp):cast_metrics_internal',
-          ],
-        }, {
-          'sources': [
-            'metrics/platform_metrics_providers_simple.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'cast_metrics_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        'cast_metrics',
-        '../base/base.gyp:base_prefs_test_support',
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../components/components.gyp:component_metrics_proto',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'metrics/cast_metrics_service_client_unittest.cc',
-      ],
-      'conditions': [
-        ['use_allocator!="none"', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ]
-    },  # end of target 'cast_metrics_unittests'
-    {
       'target_name': 'cast_net',
       'type': '<(component)',
       'sources': [
@@ -109,42 +24,6 @@
       ],
     },
     {
-      'target_name': 'cast_service',
-      'type': '<(component)',
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-      ],
-      'sources': [
-        'service/cast_service.cc',
-        'service/cast_service.h',
-      ],
-      'conditions': [
-        ['chromecast_branding=="Chrome"', {
-          'dependencies': [
-            'internal/chromecast_internal.gyp:cast_service_internal',
-          ],
-        }, {
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../content/content.gyp:content',
-          ],
-          'conditions': [
-            ['OS=="android"', {
-              'sources': [
-                'service/cast_service_android.cc',
-                'service/cast_service_android.h',
-              ],
-            }, {
-              'sources': [
-                'service/cast_service_simple.cc',
-                'service/cast_service_simple.h',
-              ],
-            }],
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'cast_shell_resources',
       'type': 'none',
       'variables': {
@@ -154,8 +33,8 @@
         {
           'action_name': 'cast_shell_resources',
           'variables': {
-            'grit_grd_file': 'shell/browser/resources/shell_resources.grd',
-            'grit_resource_ids': 'shell/browser/resources/resource_ids',
+            'grit_grd_file': 'app/resources/shell_resources.grd',
+            'grit_resource_ids': 'app/resources/resource_ids',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
@@ -204,17 +83,19 @@
       'target_name': 'cast_shell_common',
       'type': '<(component)',
       'dependencies': [
-        'cast_common',
-        'cast_metrics',
-        'cast_service',
         'cast_shell_pak',
         'cast_shell_resources',
         'cast_version_header',
         'chromecast_locales.gyp:chromecast_locales_pak',
         'chromecast_locales.gyp:chromecast_settings',
         'media/media.gyp:media_base',
+        '../base/base.gyp:base',
         '../components/components.gyp:cdm_renderer',
         '../components/components.gyp:component_metrics_proto',
+        '../components/components.gyp:metrics',
+        '../components/components.gyp:metrics_gpu',
+        '../components/components.gyp:metrics_net',
+        '../components/components.gyp:metrics_profiler',
         '../content/content.gyp:content',
         '../content/content.gyp:content_app_browser',
         '../skia/skia.gyp:skia',
@@ -222,37 +103,56 @@
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
       ],
       'sources': [
-        'shell/app/cast_main_delegate.cc',
-        'shell/app/cast_main_delegate.h',
-        'shell/browser/cast_browser_context.cc',
-        'shell/browser/cast_browser_context.h',
-        'shell/browser/cast_browser_main_parts.cc',
-        'shell/browser/cast_browser_main_parts.h',
-        'shell/browser/cast_browser_process.cc',
-        'shell/browser/cast_browser_process.h',
-        'shell/browser/cast_content_browser_client.cc',
-        'shell/browser/cast_content_browser_client.h',
-        'shell/browser/cast_download_manager_delegate.cc',
-        'shell/browser/cast_download_manager_delegate.h',
-        'shell/browser/cast_http_user_agent_settings.cc',
-        'shell/browser/cast_http_user_agent_settings.h',
-        'shell/browser/cast_network_delegate.cc',
-        'shell/browser/cast_network_delegate.h',
-        'shell/browser/devtools/cast_dev_tools_delegate.cc',
-        'shell/browser/devtools/cast_dev_tools_delegate.h',
-        'shell/browser/devtools/remote_debugging_server.cc',
-        'shell/browser/devtools/remote_debugging_server.h',
-        'shell/browser/geolocation/cast_access_token_store.cc',
-        'shell/browser/geolocation/cast_access_token_store.h',
-        'shell/browser/url_request_context_factory.cc',
-        'shell/browser/url_request_context_factory.h',
-        'shell/browser/webui/webui_cast.h',
-        'shell/common/cast_content_client.cc',
-        'shell/common/cast_content_client.h',
-        'shell/renderer/cast_content_renderer_client.cc',
-        'shell/renderer/cast_content_renderer_client.h',
-        'shell/renderer/key_systems_cast.cc',
-        'shell/renderer/key_systems_cast.h',
+        'app/cast_main_delegate.cc',
+        'app/cast_main_delegate.h',
+        'browser/cast_browser_context.cc',
+        'browser/cast_browser_context.h',
+        'browser/cast_browser_main_parts.cc',
+        'browser/cast_browser_main_parts.h',
+        'browser/cast_browser_process.cc',
+        'browser/cast_browser_process.h',
+        'browser/cast_content_browser_client.cc',
+        'browser/cast_content_browser_client.h',
+        'browser/cast_download_manager_delegate.cc',
+        'browser/cast_download_manager_delegate.h',
+        'browser/cast_http_user_agent_settings.cc',
+        'browser/cast_http_user_agent_settings.h',
+        'browser/cast_network_delegate.cc',
+        'browser/cast_network_delegate.h',
+        'browser/devtools/cast_dev_tools_delegate.cc',
+        'browser/devtools/cast_dev_tools_delegate.h',
+        'browser/devtools/remote_debugging_server.cc',
+        'browser/devtools/remote_debugging_server.h',
+        'browser/geolocation/cast_access_token_store.cc',
+        'browser/geolocation/cast_access_token_store.h',
+        'browser/metrics/cast_metrics_prefs.cc',
+        'browser/metrics/cast_metrics_prefs.h',
+        'browser/metrics/cast_metrics_service_client.cc',
+        'browser/metrics/cast_metrics_service_client.h',
+        'browser/metrics/cast_stability_metrics_provider.cc',
+        'browser/metrics/cast_stability_metrics_provider.h',
+        'browser/metrics/platform_metrics_providers.h',
+        'browser/service/cast_service.cc',
+        'browser/service/cast_service.h',
+        'browser/url_request_context_factory.cc',
+        'browser/url_request_context_factory.h',
+        'browser/webui/webui_cast.h',
+        'common/cast_content_client.cc',
+        'common/cast_content_client.h',
+        'common/cast_paths.cc',
+        'common/cast_paths.h',
+        'common/cast_resource_delegate.cc',
+        'common/cast_resource_delegate.h',
+        'common/chromecast_config.cc',
+        'common/chromecast_config.h',
+        'common/chromecast_switches.cc',
+        'common/chromecast_switches.h',
+        'common/pref_names.cc',
+        'common/pref_names.h',
+        'renderer/cast_content_renderer_client.cc',
+        'renderer/cast_content_renderer_client.h',
+        'renderer/key_systems_cast.cc',
+        'renderer/key_systems_cast.h',
       ],
       'conditions': [
         ['chromecast_branding=="Chrome"', {
@@ -261,15 +161,52 @@
           ],
         }, {
           'sources': [
-            'shell/browser/cast_network_delegate_simple.cc',
-            'shell/browser/devtools/remote_debugging_server_simple.cc',
-            'shell/browser/webui/webui_cast_simple.cc',
-            'shell/renderer/key_systems_cast_simple.cc',
+            'browser/cast_network_delegate_simple.cc',
+            'browser/devtools/remote_debugging_server_simple.cc',
+            'browser/metrics/platform_metrics_providers_simple.cc',
+            'browser/webui/webui_cast_simple.cc',
+            'common/chromecast_config_simple.cc',
+            'renderer/key_systems_cast_simple.cc',
+          ],
+          'conditions': [
+            ['OS=="android"', {
+              'sources': [
+                'browser/service/cast_service_android.cc',
+                'browser/service/cast_service_android.h',
+              ],
+            }, {
+              'sources': [
+                'browser/service/cast_service_simple.cc',
+                'browser/service/cast_service_simple.h',
+              ],
+            }],
           ],
         }],
       ],
     },
     {
+      'target_name': 'cast_shell_unittests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        'cast_shell_common',
+        '../base/base.gyp:base_prefs_test_support',
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../components/components.gyp:component_metrics_proto',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'browser/metrics/cast_metrics_service_client_unittest.cc',
+      ],
+      'conditions': [
+        ['use_allocator!="none"', {
+          'dependencies': [
+            '../base/allocator/allocator.gyp:allocator',
+          ],
+        }],
+      ]
+    },  # end of target 'cast_metrics_unittests'
+    {
       'target_name': 'cast_version_header',
       'type': 'none',
       'direct_dependent_settings': {
@@ -321,7 +258,6 @@
           'target_name': 'libcast_shell_android',
           'type': 'shared_library',
           'dependencies': [
-            'cast_common',
             'cast_jni_headers',
             'cast_shell_common',
             'cast_shell_pak',
@@ -345,17 +281,17 @@
             'android/chromecast_config_android.cc',
             'android/chromecast_config_android.h',
             'android/platform_jni_loader.h',
+            'app/android/cast_jni_loader.cc',
+            'browser/android/cast_window_android.cc',
+            'browser/android/cast_window_android.h',
+            'browser/android/cast_window_manager.cc',
+            'browser/android/cast_window_manager.h',
+            'browser/android/external_video_surface_container_impl.cc',
+            'browser/android/external_video_surface_container_impl.h',
             'crash/android/cast_crash_reporter_client_android.cc',
             'crash/android/cast_crash_reporter_client_android.h',
             'crash/android/crash_handler.cc',
             'crash/android/crash_handler.h',
-            'shell/app/android/cast_jni_loader.cc',
-            'shell/browser/android/cast_window_android.cc',
-            'shell/browser/android/cast_window_android.h',
-            'shell/browser/android/cast_window_manager.cc',
-            'shell/browser/android/cast_window_manager.h',
-            'shell/browser/android/external_video_surface_container_impl.cc',
-            'shell/browser/android/external_video_surface_container_impl.h',
           ],
           'conditions': [
             ['chromecast_branding=="Chrome"', {
@@ -383,8 +319,8 @@
           ],
           'variables': {
             'has_java_resources': 1,
-            'java_in_dir': 'shell/android/apk',
-            'resource_dir': 'shell/android/apk/res',
+            'java_in_dir': 'browser/android/apk',
+            'resource_dir': 'browser/android/apk/res',
             'R_package': 'org.chromium.chromecast.shell',
           },
           'includes': ['../build/java.gypi'],
@@ -406,7 +342,7 @@
             # if the actual Java path is used.
             # This will hopefully be removable after the great GN migration.
             'java_in_dir': 'android',
-            'android_manifest_path': 'shell/android/apk/AndroidManifest.xml',
+            'android_manifest_path': 'browser/android/apk/AndroidManifest.xml',
             'package_name': 'org.chromium.chromecast.shell',
             'native_lib_target': 'libcast_shell_android',
             'asset_location': '<(PRODUCT_DIR)/assets',
@@ -418,10 +354,10 @@
           'target_name': 'cast_jni_headers',
           'type': 'none',
           'sources': [
-            'shell/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java',
-            'shell/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java',
-            'shell/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java',
-            'shell/android/apk/src/org/chromium/chromecast/shell/ExternalVideoSurfaceContainer.java',
+            'browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java',
+            'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java',
+            'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java',
+            'browser/android/apk/src/org/chromium/chromecast/shell/ExternalVideoSurfaceContainer.java',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
@@ -467,7 +403,7 @@
             'cast_shell_core',
           ],
           'sources': [
-            'shell/app/cast_main.cc',
+            'app/cast_main.cc',
           ],
         },
         {
@@ -481,7 +417,7 @@
             'HAS_OUT_OF_PROC_TEST_RUNNER',
           ],
           'sources': [
-            'shell/browser/test/chromecast_shell_browser_test.cc',
+            'browser/test/chromecast_shell_browser_test.cc',
           ],
         },
         {
@@ -496,9 +432,9 @@
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
-            'shell/browser/test/chromecast_browser_test.cc',
-            'shell/browser/test/chromecast_browser_test.h',
-            'shell/browser/test/chromecast_browser_test_runner.cc',
+            'browser/test/chromecast_browser_test.cc',
+            'browser/test/chromecast_browser_test.h',
+            'browser/test/chromecast_browser_test_runner.cc',
           ],
         },
       ],  # end of targets