Revert 42757 - Uses GeolocationContentSettingsMap on GeolocationPermissionCon...

chrome/browser/geolocation/geolocation_permission_context.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_dispatcher_host.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/render_messages.h"
@@ skipping 86 matching lines @@
     Profile* profile)
     : profile_(profile) {
 }
 
 GeolocationPermissionContext::~GeolocationPermissionContext() {
 }
 
 void GeolocationPermissionContext::RequestGeolocationPermission(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame) {
-  if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this,
-            &GeolocationPermissionContext::RequestGeolocationPermission,
-            render_process_id, render_view_id, bridge_id, requesting_frame));
-    return;
-  }
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-  TabContents* tab_contents =
-      tab_util::GetTabContentsByID(render_process_id, render_view_id);
-  if (!tab_contents) {
-    // The tab may have gone away, or the request may not be from a tab at all.
-    LOG(WARNING) << "Attempt to use geolocation tabless renderer: "
-        << render_process_id << "," << render_view_id << "," << bridge_id
-        << " (geolocation is not supported in extensions)";
-    NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
-                        requesting_frame, false);
-    return;
-  }
-
-  GURL embedder = tab_contents->GetURL();
-  ContentSetting content_setting =
-      profile_->GetGeolocationContentSettingsMap()->GetContentSetting(
-          requesting_frame, embedder);
-  if (content_setting == CONTENT_SETTING_BLOCK) {
-    NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
-                        requesting_frame, false);
-  } else if (content_setting == CONTENT_SETTING_ALLOW) {
-    NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
-                        requesting_frame, true);
-  } else { // setting == ask. Prompt the user.
-    RequestPermissionFromUI(render_process_id, render_view_id, bridge_id,
-                            requesting_frame);
-  }
+  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+  RequestPermissionFromUI(render_process_id, render_view_id, bridge_id,
+                          requesting_frame);
 }
 
 void GeolocationPermissionContext::SetPermission(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame, bool allowed) {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  TabContents* tab_contents =
-      tab_util::GetTabContentsByID(render_process_id, render_view_id);
-  GURL embedder = tab_contents->GetURL();
-  ContentSetting content_setting =
-      allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
-  profile_->GetGeolocationContentSettingsMap()->SetContentSetting(
-      requesting_frame.GetOrigin(), embedder.GetOrigin(), content_setting);
   NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
                       requesting_frame, allowed);
 }
 
 GeolocationArbitrator* GeolocationPermissionContext::StartUpdatingRequested(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   // TODO(joth): Use requesting_frame parameter to short-circuit the latched
   // permission-denied case, and so avoid starting up location arbitrator.
   if (!location_arbitrator_)
     location_arbitrator_ = GeolocationArbitrator::GetInstance();
   return location_arbitrator_;
 }
 
 void GeolocationPermissionContext::RequestPermissionFromUI(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame) {
+  if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE,
+        NewRunnableMethod(this,
+            &GeolocationPermissionContext::RequestPermissionFromUI,
+            render_process_id, render_view_id, bridge_id, requesting_frame));
+    return;
+  }
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   TabContents* tab_contents =
       tab_util::GetTabContentsByID(render_process_id, render_view_id);
   if (!tab_contents) {
     // The tab may have gone away, or the request may not be from a tab at all.
     LOG(WARNING) << "Attempt to use geolocation tabless renderer: "
         << render_process_id << "," << render_view_id << "," << bridge_id
         << " (geolocation is not supported in extensions)";
     NotifyPermissionSet(render_process_id, render_view_id, bridge_id,
                         requesting_frame, false);
     return;
   }
   tab_contents->AddInfoBar(new GeolocationConfirmInfoBarDelegate(tab_contents,
       this, render_process_id, render_view_id, bridge_id, requesting_frame));
 }
 
 void GeolocationPermissionContext::NotifyPermissionSet(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame, bool allowed) {
+  if (!ChromeThread::CurrentlyOn(ChromeThread::UI)) {
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE,
+        NewRunnableMethod(this,
+            &GeolocationPermissionContext::NotifyPermissionSet,
+            render_process_id, render_view_id, bridge_id, requesting_frame,
+            allowed));
+    return;
+  }
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   RenderViewHostDelegate::Resource* resource =
       tab_util::GetTabContentsByID(render_process_id, render_view_id);
   // TabContents may have gone away (or not exists for extension).
   if (resource)
     resource->OnGeolocationPermissionSet(requesting_frame, allowed);
 
   CallRenderViewHost(
       render_process_id, render_view_id,
       &RenderViewHost::Send,
       new ViewMsg_Geolocation_PermissionSet(render_view_id, bridge_id,
           allowed));
 }