Media Remoting Clean-up: Less-redundant naming, style consistency, etc.

media/remoting/BUILD.gn

Index: media/remoting/BUILD.gn
diff --git a/media/remoting/BUILD.gn b/media/remoting/BUILD.gn
index 3643543a6bddce3ff7c5f9ba3503d3b11e56ed10..d605e7c5855b2d6bccbb65e3747c35e3d4bd1e50 100644
--- a/media/remoting/BUILD.gn
+++ b/media/remoting/BUILD.gn
@@ -8,18 +8,20 @@ import("//third_party/protobuf/proto_library.gni")
 proto_library("media_remoting_proto") {
   proto_out_dir = "media/remoting"
   sources = [
-    "proto/remoting_rpc_message.proto",
+    "rpc.proto",
   ]
 }
 
+# This target is separate from "remoting" because this code is shared by the
+# receiver implementation (currently outside of the Chromium project).
 source_set("rpc") {
   sources = [
-    "rpc/proto_enum_utils.cc",
-    "rpc/proto_enum_utils.h",
-    "rpc/proto_utils.cc",
-    "rpc/proto_utils.h",
-    "rpc/rpc_broker.cc",
-    "rpc/rpc_broker.h",
+    "proto_enum_utils.cc",
+    "proto_enum_utils.h",
+    "proto_utils.cc",
+    "proto_utils.h",
+    "rpc_broker.cc",
+    "rpc_broker.h",
   ]
 
   deps = [
@@ -34,12 +36,16 @@ source_set("rpc") {
 
 source_set("remoting") {
   sources = [
+    "adaptive_renderer_factory.cc",
+    "adaptive_renderer_factory.h",
+    "courier_renderer.cc",
+    "courier_renderer.h",
+    "demuxer_stream_adapter.cc",
+    "demuxer_stream_adapter.h",
+    "interstitial.cc",
+    "interstitial.h",
     "metrics.cc",
     "metrics.h",
-    "remote_demuxer_stream_adapter.cc",
-    "remote_demuxer_stream_adapter.h",
-    "remote_renderer_impl.cc",
-    "remote_renderer_impl.h",
     "remoting_cdm.cc",
     "remoting_cdm.h",
     "remoting_cdm_context.cc",
@@ -48,18 +54,15 @@ source_set("remoting") {
     "remoting_cdm_controller.h",
     "remoting_cdm_factory.cc",
     "remoting_cdm_factory.h",
-    "remoting_interstitial_ui.cc",
-    "remoting_interstitial_ui.h",
-    "remoting_renderer_controller.cc",
-    "remoting_renderer_controller.h",
-    "remoting_renderer_factory.cc",
-    "remoting_renderer_factory.h",
-    "remoting_sink_observer.cc",
-    "remoting_sink_observer.h",
-    "remoting_source_impl.cc",
-    "remoting_source_impl.h",
+    "renderer_controller.cc",
+    "renderer_controller.h",
+    "shared_session.cc",
+    "shared_session.h",
+    "sink_availability_observer.cc",
+    "sink_availability_observer.h",
     "triggers.h",
   ]
+
   deps = [
     ":rpc",
     "//base",
@@ -74,15 +77,15 @@ source_set("remoting") {
 source_set("media_remoting_tests") {
   testonly = true
   sources = [
-    "fake_remoting_controller.cc",
-    "fake_remoting_controller.h",
-    "fake_remoting_demuxer_stream_provider.cc",
-    "fake_remoting_demuxer_stream_provider.h",
-    "remote_demuxer_stream_adapter_unittest.cc",
-    "remote_renderer_impl_unittest.cc",
-    "remoting_renderer_controller_unittest.cc",
-    "rpc/proto_utils_unittest.cc",
-    "rpc/rpc_broker_unittest.cc",
+    "courier_renderer_unittest.cc",
+    "demuxer_stream_adapter_unittest.cc",
+    "fake_demuxer_stream_provider.cc",
+    "fake_demuxer_stream_provider.h",
+    "fake_remoter.cc",
+    "fake_remoter.h",
+    "proto_utils_unittest.cc",
+    "renderer_controller_unittest.cc",
+    "rpc_broker_unittest.cc",
   ]
 
   deps = [