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

media/remoting/situational_renderer_factory.h

Index: media/remoting/situational_renderer_factory.h
diff --git a/media/remoting/remoting_renderer_factory.h b/media/remoting/situational_renderer_factory.h
similarity index 52%
rename from media/remoting/remoting_renderer_factory.h
rename to media/remoting/situational_renderer_factory.h
index d4596c2d318881585dbd70cadec5376226d6e332..7c98eeb3f2e038bffa8d0d3810b2113c7d04eddf 100644
--- a/media/remoting/remoting_renderer_factory.h
+++ b/media/remoting/situational_renderer_factory.h
@@ -2,22 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_
-#define MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_
+#ifndef MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_
+#define MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_
 
 #include "media/base/renderer_factory.h"
-#include "media/remoting/remoting_renderer_controller.h"
+#include "media/remoting/renderer_controller.h"
 
 namespace media {
+namespace remoting {
 
-// Create renderer for local playback or remoting according to info from
-// |remoting_renderer_controller|.
-class RemotingRendererFactory : public RendererFactory {
+// Creates Renderers for either local playback or remote playback, as directed
+// by the RendererController.
+class SituationalRendererFactory : public RendererFactory {
  public:
-  RemotingRendererFactory(
+  SituationalRendererFactory(
       std::unique_ptr<RendererFactory> default_renderer_factory,
-      std::unique_ptr<RemotingRendererController> remoting_renderer_controller);
-  ~RemotingRendererFactory() override;
+      std::unique_ptr<RendererController> controller);
+  ~SituationalRendererFactory() override;
 
   std::unique_ptr<Renderer> CreateRenderer(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
@@ -28,12 +29,12 @@ class RemotingRendererFactory : public RendererFactory {
 
  private:
   const std::unique_ptr<RendererFactory> default_renderer_factory_;
-  const std::unique_ptr<RemotingRendererController>
-      remoting_renderer_controller_;
+  const std::unique_ptr<RendererController> controller_;
 
-  DISALLOW_COPY_AND_ASSIGN(RemotingRendererFactory);
+  DISALLOW_COPY_AND_ASSIGN(SituationalRendererFactory);
 };
 
+}  // namespace remoting
 }  // namespace media
 
-#endif  // MEDIA_REMOTING_REMOTING_RENDERER_FACTORY_H_
+#endif  // MEDIA_REMOTING_SITUATIONAL_RENDERER_FACTORY_H_