Make RendererMediaPlayerManager a RenderFrameObserver.

content/browser/renderer_host/render_view_host_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 class Range;
 }
 
 namespace ui {
 class AXTree;
 struct SelectedFileInfo;
 }
 
 namespace content {
 
-class BrowserMediaPlayerManager;
+class MediaWebContentsObserver;
 class ChildProcessSecurityPolicyImpl;
 class PageState;
 class RenderWidgetHostDelegate;
 class SessionStorageNamespace;
 class SessionStorageNamespaceImpl;
 class TestRenderViewHost;
 class TimeoutMonitor;
 struct FileChooserParams;
 
 #if defined(COMPILER_MSVC)
@@ skipping 318 matching lines @@
   // Creates a full screen RenderWidget.
   void CreateNewFullscreenWidget(int route_id);
 
 #if defined(OS_MACOSX)
   // Select popup menu related methods (for external popup menus).
   void DidSelectPopupMenuItem(int selected_index);
   void DidCancelPopupMenu();
 #endif
 
 #if defined(OS_ANDROID)
-  BrowserMediaPlayerManager* media_player_manager() {
-    return media_player_manager_.get();
+  MediaWebContentsObserver* media_web_contents_observer() {
+    return media_web_contents_observer_.get();
   }
 
   void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
   void DidCancelPopupMenu();
 #endif
 
   int main_frame_routing_id() const {
     return main_frame_routing_id_;
   }
 
@@ skipping 211 matching lines @@
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
   // The termination status of the last render view that terminated.
   base::TerminationStatus render_view_termination_status_;
 
   // Set to true if we requested the on screen keyboard to be displayed.
   bool virtual_keyboard_requested_;
 
 #if defined(OS_ANDROID)
-  // Manages all the android mediaplayer objects and handling IPCs for video.
-  scoped_ptr<BrowserMediaPlayerManager> media_player_manager_;
+  // Manages all the android mediaplayer managers and forwards IPCs to the
+  // managers.
+  scoped_ptr<MediaWebContentsObserver> media_web_contents_observer_;
 #endif
 
   // Used to swap out or shutdown this RVH when the unload event is taking too
   // long to execute, depending on the number of active views in the
   // SiteInstance.
   // TODO(nasko): Move to RenderFrameHost, as this is per-frame state.
   scoped_ptr<TimeoutMonitor> unload_event_monitor_timeout_;
 
   // Called after receiving the SwapOutACK when the RVH is in state pending
   // shutdown. Also called if the unload timer times out.
   // TODO(nasko): Move to RenderFrameHost, as this is per-frame state.
   base::Closure pending_shutdown_on_swap_out_;
 
   base::WeakPtrFactory<RenderViewHostImpl> weak_factory_;
 
   // True if the current focused element is editable.
   bool is_focused_element_editable_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_