Migrate geolocation permissions to the new common permission class.

chrome/browser/content_settings/permission_context_base.cc

Index: chrome/browser/content_settings/permission_context_base.cc
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc
index b85f0a77c20f3dd2a6f8968da73dfd920c8c0f0d..40ff1553a21652db6e1f93025ac15a8e0317b89c 100644
--- a/chrome/browser/content_settings/permission_context_base.cc
+++ b/chrome/browser/content_settings/permission_context_base.cc
@@ -23,7 +23,8 @@ PermissionContextBase::PermissionContextBase(
     const ContentSettingsType permission_type)
     : profile_(profile),
       permission_type_(permission_type),
-      weak_factory_(this) {
+      weak_factory_(this),
+      shutting_down_(false) {
   permission_queue_controller_.reset(
       new PermissionQueueController(profile_, permission_type_));
 }
@@ -40,6 +41,8 @@ void PermissionContextBase::RequestPermission(
     const BrowserPermissionCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
+  if (shutting_down_)
+    return;
   DecidePermission(web_contents,
                    id,
                    requesting_frame.GetOrigin(),
@@ -48,6 +51,27 @@ void PermissionContextBase::RequestPermission(
                    callback);
 }
 
+void PermissionContextBase::CancelPermissionRequest(
+    content::WebContents* web_contents,
+    const PermissionRequestID& id) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[Bernhard Bauer, 2014/08/13 13:34:32]

Nit: I always forget this myself, but there is DCHECK_CURRENTLY_ON, which will
provide more meaningful error messages on failure.

[Miguel Garcia, 2014/08/13 14:25:50]

Nice!

+  if (shutting_down_)

[Bernhard Bauer, 2014/08/13 13:34:32]

When is this called during shutdown?

[Miguel Garcia, 2014/08/13 14:25:50]

This can be called by webkit at any time essentially.

[Bernhard Bauer, 2014/08/13 21:05:08]

Well, not really at *any* time... The reason why I'm asking is because this is a
KeyedService, so the profile must exist when this method is called, but the
interval between KeyedService::Shutdown() and profile destruction is actually
very short! Basically, all keyed services are shut down in topological order
specified by their dependencies, then destroyed. During Shutdown(), a
KeyedService should drop all of its references to other keyed services, because
they will go away soon.

That means that if this is called between Shutdown() and destruction, it's
during shutdown of another KeyedService. But a) we know that this call is coming
from Blink, and b) if it was coming from another KeyedService, it would mean
that the other service was not specifying its dependencies correctly (or
otherwise it would be shut down after us).

A shutdown flag is applicable to a RefCountedKeyedService that is used on
another thread (because it might actually outlive the profile), but not in this
case.

+    return;
+
+  if (PermissionBubbleManager::Enabled()) {
+    PermissionBubbleRequest* cancelling =
+        pending_bubbles_.get(id.ToString());
+    if (cancelling != NULL && web_contents != NULL &&
+        PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
+      PermissionBubbleManager::FromWebContents(web_contents)->
+          CancelRequest(cancelling);
+    }
+    return;
+  }
+
+  GetQueueController()->CancelInfoBarRequest(id);
+}
+
 void PermissionContextBase::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
@@ -58,7 +82,8 @@ void PermissionContextBase::DecidePermission(
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ContentSetting content_setting =
-      profile_->GetHostContentSettingsMap()->GetContentSetting(
+      profile_->GetHostContentSettingsMap()
+      ->GetContentSettingAndMaybeUpdateLastUsage(
           requesting_origin, embedder_origin, permission_type_, std::string());
   switch (content_setting) {
     case CONTENT_SETTING_BLOCK:
@@ -183,3 +208,8 @@ void PermissionContextBase::UpdateContentSetting(
       std::string(),
       content_setting);
 }
+
+void PermissionContextBase::Shutdown() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  shutting_down_ = true;
+}