media: Add BrowserCdmManagerProcessWatcher.

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 830 matching lines @@
   // The FontCacheDispatcher is required only when we're using GDI rendering.
   // TODO(scottmg): pdf/ppapi still require the renderer to be able to precache
   // GDI fonts (http://crbug.com/383227), even when using DirectWrite. This
   // should eventually be if (!ShouldUseDirectWrite()) guarded.
   channel_->AddFilter(new FontCacheDispatcher());
 #elif defined(OS_ANDROID)
   browser_demuxer_android_ = new BrowserDemuxerAndroid();
   AddFilter(browser_demuxer_android_.get());
 #endif
 #if defined(ENABLE_BROWSER_CDMS)
-  browser_cdm_manager_ = new BrowserCdmManager(GetID(), NULL);
-  AddFilter(browser_cdm_manager_.get());
+  AddFilter(new BrowserCdmManager(GetID(), NULL));
 #endif
 
   WebSocketDispatcherHost::GetRequestContextCallback
       websocket_request_context_callback(
           base::Bind(&GetRequestContext, request_context,
                      media_request_context, RESOURCE_TYPE_SUB_RESOURCE));
 
   AddFilter(
       new WebSocketDispatcherHost(GetID(), websocket_request_context_callback));
 
@@ skipping 154 matching lines @@
   } else {
     // Store the ValueState locally in case a Valuebuffer subscribes to it later
     pending_valuebuffer_state_->UpdateState(target, state);
   }
 }
 
 #if defined(ENABLE_BROWSER_CDMS)
 media::BrowserCdm* RenderProcessHostImpl::GetBrowserCdm(int render_frame_id,
                                                         int cdm_id) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return browser_cdm_manager_->GetCdm(render_frame_id, cdm_id);
+  BrowserCdmManager* manager = BrowserCdmManager::FromProcess(GetID());
+  if (!manager)
+    return nullptr;
+  return manager->GetCdm(render_frame_id, cdm_id);
 }
 #endif
 
 void RenderProcessHostImpl::AddRoute(
     int32 routing_id,
     IPC::Listener* listener) {
   CHECK(!listeners_.Lookup(routing_id))
       << "Found Routing ID Conflict: " << routing_id;
   listeners_.AddWithID(listener, routing_id);
 }
@@ skipping 641 matching lines @@
     // It's important not to wait for the DeleteTask to delete the channel
     // proxy. Kill it off now. That way, in case the profile is going away, the
     // rest of the objects attached to this RenderProcessHost start going
     // away first, since deleting the channel proxy will post a
     // OnChannelClosed() to IPC::ChannelProxy::Context on the IO thread.
     channel_.reset();
 
     // The following members should be cleared in ProcessDied() as well!
     gpu_message_filter_ = NULL;
     message_port_message_filter_ = NULL;
-#if defined(ENABLE_BROWSER_CDMS)
-    browser_cdm_manager_ = NULL;
-#endif
 
     RemoveUserData(kSessionStorageHolderKey);
 
     // Remove ourself from the list of renderer processes so that we can't be
     // reused in between now and when the Delete task runs.
     UnregisterHost(GetID());
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
     if (!io_surface_manager_token_.IsZero()) {
       BrowserIOSurfaceManager::GetInstance()->InvalidateChildProcessToken(
@@ skipping 420 matching lines @@
       NOTIFICATION_RENDERER_PROCESS_CLOSED,
       Source<RenderProcessHost>(this),
       Details<RendererClosedDetails>(&details));
   FOR_EACH_OBSERVER(RenderProcessHostObserver,
                     observers_,
                     RenderProcessExited(this, status, exit_code));
   within_process_died_observer_ = false;
 
   gpu_message_filter_ = NULL;
   message_port_message_filter_ = NULL;
-#if defined(ENABLE_BROWSER_CDMS)
-  browser_cdm_manager_ = NULL;
-#endif
   RemoveUserData(kSessionStorageHolderKey);
 
   IDMap<IPC::Listener>::iterator iter(&listeners_);
   while (!iter.IsAtEnd()) {
     iter.GetCurrentValue()->OnMessageReceived(
         FrameHostMsg_RenderProcessGone(iter.GetCurrentKey(),
                                        static_cast<int>(status),
                                        exit_code));
     iter.Advance();
   }
@@ skipping 369 matching lines @@
 void RenderProcessHostImpl::GetAudioOutputControllers(
     const GetAudioOutputControllersCallback& callback) const {
   audio_renderer_host()->GetOutputControllers(callback);
 }
 
 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
   return bluetooth_dispatcher_host_.get();
 }
 
 }  // namespace content