Destroy GeolocationInfobarQueueController on UI thread.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // Copyright (c) 2012 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/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using extensions::APIPermission;
 
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
-    : profile_(profile) {
+    : profile_(profile),
+      shutting_down_(false) {
 }
 
 ChromeGeolocationPermissionContext::~ChromeGeolocationPermissionContext() {
+  // ChromeGeolocationPermissionContext may be destroyed on either the UI thread
+  // or the IO thread, but the GeolocationInfobarQueueController must have been
+  // destroyed on the UI thread.
+  DCHECK(!geolocation_infobar_queue_controller_.get());
 }
 
 void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame,
     base::Callback<void(bool)> callback) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::RequestGeolocationPermission,
             this, render_process_id, render_view_id, bridge_id,
             requesting_frame, callback));
     return;
   }
 
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  if (shutting_down_)
+    return;
+
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
   const GeolocationPermissionRequestID id(render_process_id, render_view_id,
                                           bridge_id);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->extensions()->GetExtensionOrAppByURL(
             ExtensionURLInfo(WebKit::WebSecurityOrigin::createFromString(
@@ skipping 26 matching lines @@
   GURL embedder = web_contents->GetURL();
   if (!requesting_frame.is_valid() || !embedder.is_valid()) {
     LOG(WARNING) << "Attempt to use geolocation from an invalid URL: "
                  << requesting_frame << "," << embedder
                  << " (geolocation is not supported in popups)";
     NotifyPermissionSet(id, requesting_frame, callback, false);
     return;
   }
 
   DecidePermission(id, requesting_frame, embedder, callback);
-
 }
 
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame) {
   CancelPendingInfoBarRequest(GeolocationPermissionRequestID(
       render_process_id, render_view_id, bridge_id));
 }
@@ skipping 18 matching lines @@
       break;
     default:
       // setting == ask. Prompt the user.
       QueueController()->CreateInfoBarRequest(
           id, requesting_frame, embedder, base::Bind(
               &ChromeGeolocationPermissionContext::NotifyPermissionSet,
               base::Unretained(this), id, requesting_frame, callback));
   }
 }
 
+void ChromeGeolocationPermissionContext::ShutdownOnUIThread() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  geolocation_infobar_queue_controller_.reset();
+  shutting_down_ = true;
+}
+
 void ChromeGeolocationPermissionContext::PermissionDecided(
     const GeolocationPermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     base::Callback<void(bool)> callback,
     bool allowed) {
   NotifyPermissionSet(id, requesting_frame, callback, allowed);
 }
 
 void ChromeGeolocationPermissionContext::NotifyPermissionSet(
@@ skipping 11 matching lines @@
     content_settings->OnGeolocationPermissionSet(requesting_frame.GetOrigin(),
                                                  allowed);
   }
 
   callback.Run(allowed);
 }
 
 GeolocationInfoBarQueueController*
 ChromeGeolocationPermissionContext::QueueController() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(!shutting_down_);
   if (!geolocation_infobar_queue_controller_)
     geolocation_infobar_queue_controller_.reset(CreateQueueController());
   return geolocation_infobar_queue_controller_.get();
 }
 
 GeolocationInfoBarQueueController*
 ChromeGeolocationPermissionContext::CreateQueueController() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   return new GeolocationInfoBarQueueController(profile());
 }
 
 void ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest(
     const GeolocationPermissionRequestID& id) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(
             &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
             this, id));
      return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  if (shutting_down_)
+    return;
   QueueController()->CancelInfoBarRequest(id);
 }