Index: extensions/browser/guest_view/web_view/web_view_guest.cc |
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc |
index 25f3249d44ebdebd041ab9ff1eb06b1daeed344c..97e34148d84d118fb116692c5be450faeb05e3fe 100644 |
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc |
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc |
@@ -474,7 +474,8 @@ void WebViewGuest::GuestDestroyed() { |
void WebViewGuest::GuestReady() { |
// The guest RenderView should always live in an isolated guest process. |
CHECK(web_contents()->GetRenderProcessHost()->IsForGuestsOnly()); |
- Send(new ExtensionMsg_SetFrameName(web_contents()->GetRoutingID(), name_)); |
+ Send(new ExtensionMsg_SetFrameName( |
+ web_contents()->GetRenderViewHost()->GetRoutingID(), name_)); |
// We don't want to accidentally set the opacity of an interstitial page. |
// WebContents::GetRenderWidgetHostView will return the RWHV of an |
@@ -953,12 +954,11 @@ void WebViewGuest::PushWebViewStateToIOThread() { |
web_view_info.embedder_process_id, web_view_info.instance_id); |
content::BrowserThread::PostTask( |
- content::BrowserThread::IO, |
- FROM_HERE, |
+ content::BrowserThread::IO, FROM_HERE, |
base::Bind(&WebViewRendererState::AddGuest, |
base::Unretained(WebViewRendererState::GetInstance()), |
web_contents()->GetRenderProcessHost()->GetID(), |
- web_contents()->GetRoutingID(), |
+ web_contents()->GetRenderViewHost()->GetRoutingID(), |
web_view_info)); |
} |
@@ -967,11 +967,10 @@ void WebViewGuest::RemoveWebViewStateFromIOThread( |
WebContents* web_contents) { |
content::BrowserThread::PostTask( |
content::BrowserThread::IO, FROM_HERE, |
- base::Bind( |
- &WebViewRendererState::RemoveGuest, |
- base::Unretained(WebViewRendererState::GetInstance()), |
- web_contents->GetRenderProcessHost()->GetID(), |
- web_contents->GetRoutingID())); |
+ base::Bind(&WebViewRendererState::RemoveGuest, |
+ base::Unretained(WebViewRendererState::GetInstance()), |
+ web_contents->GetRenderProcessHost()->GetID(), |
+ web_contents->GetRenderViewHost()->GetRoutingID())); |
} |
void WebViewGuest::RequestMediaAccessPermission( |