| Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc | 
| diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc | 
| index 3279b883352a0d4b662adb35c548fe158a5d6385..8ec076ba845949770b932bfc58b7620329154467 100644 | 
| --- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc | 
| +++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc | 
| @@ -7,16 +7,18 @@ | 
| #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 
| #include "chrome/browser/geolocation/geolocation_permission_context.h" | 
| #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" | 
| +#include "chrome/browser/guest_view/web_view/web_view_constants.h" | 
| +#include "chrome/browser/guest_view/web_view/web_view_guest.h" | 
| #include "chrome/browser/plugins/chrome_plugin_service_filter.h" | 
| #include "chrome/browser/profiles/profile.h" | 
| #include "chrome/common/render_messages.h" | 
| #include "content/public/browser/user_metrics.h" | 
| -#include "extensions/browser/guest_view/web_view/web_view_constants.h" | 
| -#include "extensions/browser/guest_view/web_view/web_view_guest.h" | 
|  | 
| ChromeWebViewPermissionHelperDelegate::ChromeWebViewPermissionHelperDelegate( | 
| extensions::WebViewPermissionHelper* web_view_permission_helper) | 
| -    : WebViewPermissionHelperDelegate(web_view_permission_helper), | 
| +    : WebViewPermissionHelperDelegate( | 
| +        web_view_permission_helper->web_view_guest()->guest_web_contents()), | 
| +      web_view_permission_helper_(web_view_permission_helper), | 
| weak_factory_(this) { | 
| } | 
|  | 
| @@ -70,7 +72,7 @@ | 
| base::DictionaryValue info; | 
| info.SetString(std::string(kPluginName), name); | 
| info.SetString(std::string(kPluginIdentifier), identifier); | 
| -  web_view_permission_helper()->RequestPermission( | 
| +  web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_LOAD_PLUGIN, | 
| info, | 
| base::Bind(&ChromeWebViewPermissionHelperDelegate::OnPermissionResponse, | 
| @@ -127,7 +129,7 @@ | 
| const content::MediaResponseCallback& callback) { | 
| base::DictionaryValue request_info; | 
| request_info.SetString(guestview::kUrl, request.security_origin.spec()); | 
| -  web_view_permission_helper()->RequestPermission( | 
| +  web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_MEDIA, | 
| request_info, | 
| base::Bind( | 
| @@ -166,7 +168,7 @@ | 
| const base::Callback<void(bool)>& callback) { | 
| base::DictionaryValue request_info; | 
| request_info.SetString(guestview::kUrl, url.spec()); | 
| -  web_view_permission_helper()->RequestPermission( | 
| +  web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_DOWNLOAD, | 
| request_info, | 
| base::Bind( | 
| @@ -194,7 +196,7 @@ | 
| request_info.SetString(guestview::kUrl, | 
| web_contents()->GetLastCommittedURL().spec()); | 
|  | 
| -  web_view_permission_helper()->RequestPermission( | 
| +  web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_POINTER_LOCK, | 
| request_info, | 
| base::Bind(&ChromeWebViewPermissionHelperDelegate:: | 
| @@ -231,7 +233,7 @@ | 
| bridge_id, | 
| user_gesture, | 
| callback); | 
| -  int request_id = web_view_permission_helper()->RequestPermission( | 
| +  int request_id = web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_GEOLOCATION, | 
| request_info, | 
| permission_callback, | 
| @@ -273,7 +275,7 @@ | 
| void ChromeWebViewPermissionHelperDelegate::CancelGeolocationPermissionRequest( | 
| int bridge_id) { | 
| int request_id = RemoveBridgeID(bridge_id); | 
| -  web_view_permission_helper()->CancelPendingPermissionRequest(request_id); | 
| +  web_view_permission_helper_->CancelPendingPermissionRequest(request_id); | 
| } | 
|  | 
| int ChromeWebViewPermissionHelperDelegate::RemoveBridgeID(int bridge_id) { | 
| @@ -293,7 +295,7 @@ | 
| const base::Callback<void(bool)>& callback) { | 
| base::DictionaryValue request_info; | 
| request_info.SetString(guestview::kUrl, url.spec()); | 
| -  web_view_permission_helper()->RequestPermission( | 
| +  web_view_permission_helper_->RequestPermission( | 
| WEB_VIEW_PERMISSION_TYPE_FILESYSTEM, | 
| request_info, | 
| base::Bind(&ChromeWebViewPermissionHelperDelegate:: | 
|  |