Index: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc |
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc |
index 78b76340f07594e71f6b6e7d9303300e5cf9cdd8..9be58cc516abff195a611535dd41382f6f3a7cf3 100644 |
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc |
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc |
@@ -72,10 +72,10 @@ class MimeHandlerStreamManager::EmbedderObserver |
: public content::WebContentsObserver { |
public: |
EmbedderObserver(MimeHandlerStreamManager* stream_manager, |
+ const std::string& view_id, |
+ content::WebContents* web_contents, |
int render_process_id, |
- int render_frame_id, |
- const std::string& view_id); |
- |
+ int render_frame_id); |
private: |
// WebContentsObserver overrides. |
void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; |
@@ -113,13 +113,14 @@ MimeHandlerStreamManager* MimeHandlerStreamManager::Get( |
void MimeHandlerStreamManager::AddStream( |
const std::string& view_id, |
std::unique_ptr<StreamContainer> stream, |
+ content::WebContents* web_contents, |
int render_process_id, |
int render_frame_id) { |
streams_by_extension_id_[stream->extension_id()].insert(view_id); |
auto result = streams_.insert(std::make_pair(view_id, std::move(stream))); |
DCHECK(result.second); |
embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>( |
- this, render_process_id, render_frame_id, view_id); |
+ this, view_id, web_contents, render_process_id, render_frame_id); |
} |
std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( |
@@ -153,12 +154,11 @@ void MimeHandlerStreamManager::OnExtensionUnloaded( |
MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver( |
MimeHandlerStreamManager* stream_manager, |
+ const std::string& view_id, |
+ content::WebContents* web_contents, |
int render_process_id, |
- int render_frame_id, |
- const std::string& view_id) |
- : WebContentsObserver(content::WebContents::FromRenderFrameHost( |
- content::RenderFrameHost::FromID(render_process_id, |
- render_frame_id))), |
+ int render_frame_id) |
+ : WebContentsObserver(web_contents), |
stream_manager_(stream_manager), |
render_process_id_(render_process_id), |
render_frame_id_(render_frame_id), |