Destroy GeolocationInfobarQueueController on UI thread.

chrome/browser/geolocation/chrome_geolocation_permission_context.h

 // 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.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 17 matching lines @@
       int render_view_id,
       int bridge_id,
       const GURL& requesting_frame,
       base::Callback<void(bool)> callback) OVERRIDE;
   virtual void CancelGeolocationPermissionRequest(
       int render_process_id,
       int render_view_id,
       int bridge_id,
       const GURL& requesting_frame) OVERRIDE;
 
+  // Called on the UI thread when the profile is about to be destroyed.
+  void ShutdownOnUIThread();
+
  protected:
   virtual ~ChromeGeolocationPermissionContext();
 
   Profile* profile() const { return profile_; }
 
   // Return an instance of the infobar queue controller, creating it
   // if necessary.
   GeolocationInfoBarQueueController* QueueController();
 
   // Notifies whether or not the corresponding bridge is allowed to use
@@ skipping 26 matching lines @@
                                  bool allowed);
 
   // Create an InfoBarQueueController. overriden in derived classes to provide
   // additional UI flow.  Called on the UI thread.
   virtual GeolocationInfoBarQueueController* CreateQueueController();
 
  private:
   // Removes any pending InfoBar request.
   void CancelPendingInfoBarRequest(const GeolocationPermissionRequestID& id);
 
-  // This must only be accessed from the UI thread.
+  // These must only be accessed from the UI thread.
   Profile* const profile_;
-
+  bool shutting_down_;
   scoped_ptr<GeolocationInfoBarQueueController>
-      geolocation_infobar_queue_controller_;
+  geolocation_infobar_queue_controller_;

[bulach, 2013/01/10 10:38:44]

nit: I think this needs indenting.

[John Knottenbelt, 2013/01/10 15:16:26]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContext);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_