diff options
Diffstat (limited to 'chrome/browser/geolocation')
4 files changed, 22 insertions, 22 deletions
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 06f0511..df90856 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" +#include "chrome/browser/permissions/permission_request_id.h" #include "chrome/browser/profiles/profile.h" -#include "components/content_settings/core/common/permission_request_id.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/geolocation_provider.h" #include "content/public/browser/render_frame_host.h" @@ -34,7 +34,7 @@ void GeolocationPermissionContext::RequestPermission( bool permission_set; bool new_permission; if (extensions_context_.RequestPermission( - web_contents, id, id.bridge_id(), requesting_frame_origin, user_gesture, + web_contents, id, id.request_id(), requesting_frame_origin, user_gesture, callback, &permission_set, &new_permission)) { if (permission_set) { ContentSetting content_setting = @@ -60,7 +60,7 @@ void GeolocationPermissionContext::CancelPermissionRequest( const PermissionRequestID& id) { if (extensions_context_.CancelPermissionRequest( - web_contents, id.bridge_id())) + web_contents, id.request_id())) return; PermissionContextBase::CancelPermissionRequest(web_contents, id); } diff --git a/chrome/browser/geolocation/geolocation_permission_context_android.cc b/chrome/browser/geolocation/geolocation_permission_context_android.cc index 3a38c25..6b33983 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_android.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_android.cc @@ -6,7 +6,7 @@ #include "chrome/browser/android/location_settings.h" #include "chrome/browser/android/location_settings_impl.h" -#include "components/content_settings/core/common/permission_request_id.h" +#include "chrome/browser/permissions/permission_request_id.h" #include "content/public/browser/web_contents.h" #include "url/gurl.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc index 15a3209..3b10998 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc @@ -7,8 +7,8 @@ #include "base/callback.h" #if defined(ENABLE_EXTENSIONS) +#include "chrome/browser/permissions/permission_request_id.h" #include "chrome/browser/profiles/profile.h" -#include "components/content_settings/core/common/permission_request_id.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" #include "extensions/browser/process_map.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index 70d13d5..3017c8a 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -20,6 +20,7 @@ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/browser/permissions/permission_request_id.h" #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h" #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" @@ -27,7 +28,6 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -#include "components/content_settings/core/common/permission_request_id.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" @@ -116,8 +116,8 @@ class GeolocationPermissionContextTests void SetUp() override; void TearDown() override; - PermissionRequestID RequestID(int bridge_id); - PermissionRequestID RequestIDForTab(int tab, int bridge_id); + PermissionRequestID RequestID(int request_id); + PermissionRequestID RequestIDForTab(int tab, int request_id); InfoBarService* infobar_service() { return InfoBarService::FromWebContents(web_contents()); } @@ -132,10 +132,10 @@ class GeolocationPermissionContextTests void PermissionResponse(const PermissionRequestID& id, ContentSetting content_setting); - void CheckPermissionMessageSent(int bridge_id, bool allowed); - void CheckPermissionMessageSentForTab(int tab, int bridge_id, bool allowed); + void CheckPermissionMessageSent(int request_id, bool allowed); + void CheckPermissionMessageSentForTab(int tab, int request_id, bool allowed); void CheckPermissionMessageSentInternal(MockRenderProcessHost* process, - int bridge_id, + int request_id, bool allowed); void AddNewTab(const GURL& url); void CheckTabContentsState(const GURL& requesting_frame, @@ -160,21 +160,21 @@ class GeolocationPermissionContextTests }; PermissionRequestID GeolocationPermissionContextTests::RequestID( - int bridge_id) { + int request_id) { return PermissionRequestID( web_contents()->GetRenderProcessHost()->GetID(), web_contents()->GetMainFrame()->GetRoutingID(), - bridge_id, + request_id, GURL()); } PermissionRequestID GeolocationPermissionContextTests::RequestIDForTab( int tab, - int bridge_id) { + int request_id) { return PermissionRequestID( extra_tabs_[tab]->GetRenderProcessHost()->GetID(), extra_tabs_[tab]->GetMainFrame()->GetRoutingID(), - bridge_id, + request_id, GURL()); } @@ -194,30 +194,30 @@ void GeolocationPermissionContextTests::PermissionResponse( const PermissionRequestID& id, ContentSetting content_setting) { responses_[id.render_process_id()] = - std::make_pair(id.bridge_id(), content_setting == CONTENT_SETTING_ALLOW); + std::make_pair(id.request_id(), content_setting == CONTENT_SETTING_ALLOW); } void GeolocationPermissionContextTests::CheckPermissionMessageSent( - int bridge_id, + int request_id, bool allowed) { - CheckPermissionMessageSentInternal(process(), bridge_id, allowed); + CheckPermissionMessageSentInternal(process(), request_id, allowed); } void GeolocationPermissionContextTests::CheckPermissionMessageSentForTab( int tab, - int bridge_id, + int request_id, bool allowed) { CheckPermissionMessageSentInternal(static_cast<MockRenderProcessHost*>( extra_tabs_[tab]->GetRenderProcessHost()), - bridge_id, allowed); + request_id, allowed); } void GeolocationPermissionContextTests::CheckPermissionMessageSentInternal( MockRenderProcessHost* process, - int bridge_id, + int request_id, bool allowed) { ASSERT_EQ(responses_.count(process->GetID()), 1U); - EXPECT_EQ(bridge_id, responses_[process->GetID()].first); + EXPECT_EQ(request_id, responses_[process->GetID()].first); EXPECT_EQ(allowed, responses_[process->GetID()].second); responses_.erase(process->GetID()); } |