| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index a1fb9f888cb71d3ae2f3d4634843fc2a2ac517bf..15cbdcb60c0fd1f2f0828bb53d5be5d6699cd3c0 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -40,7 +40,6 @@
|
| #include "content/browser/appcache/chrome_appcache_service.h"
|
| #include "content/browser/browser_main.h"
|
| #include "content/browser/browser_main_loop.h"
|
| -#include "content/browser/browser_plugin/browser_plugin_geolocation_permission_context.h"
|
| #include "content/browser/browser_plugin/browser_plugin_message_filter.h"
|
| #include "content/browser/child_process_security_policy_impl.h"
|
| #include "content/browser/device_orientation/device_motion_message_filter.h"
|
| @@ -229,9 +228,6 @@ void DisableAecDumpOnFileThread() {
|
| base::LazyInstance<IDMap<RenderProcessHost> >::Leaky
|
| g_all_hosts = LAZY_INSTANCE_INITIALIZER;
|
|
|
| -base::LazyInstance<scoped_refptr<BrowserPluginGeolocationPermissionContext> >
|
| - g_browser_plugin_geolocation_context = LAZY_INSTANCE_INITIALIZER;
|
| -
|
| // Map of site to process, to ensure we only have one RenderProcessHost per
|
| // site in process-per-site mode. Each map is specific to a BrowserContext.
|
| class SiteProcessMap : public base::SupportsUserData::Data {
|
| @@ -691,17 +687,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
| AddFilter(new IndexedDBDispatcherHost(
|
| storage_partition_impl_->GetIndexedDBContext()));
|
|
|
| - if (IsGuest()) {
|
| - if (!g_browser_plugin_geolocation_context.Get().get()) {
|
| - g_browser_plugin_geolocation_context.Get() =
|
| - new BrowserPluginGeolocationPermissionContext();
|
| - }
|
| - geolocation_dispatcher_host_ = GeolocationDispatcherHost::New(
|
| - GetID(), g_browser_plugin_geolocation_context.Get().get());
|
| - } else {
|
| - geolocation_dispatcher_host_ = GeolocationDispatcherHost::New(
|
| - GetID(), browser_context->GetGeolocationPermissionContext());
|
| - }
|
| + geolocation_dispatcher_host_ = GeolocationDispatcherHost::New(
|
| + GetID(), browser_context->GetGeolocationPermissionContext());
|
| AddFilter(geolocation_dispatcher_host_);
|
| gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get());
|
| AddFilter(gpu_message_filter_);
|
|
|