Destroy GeolocationInfobarQueueController on UI thread.

chrome/browser/geolocation/chrome_geolocation_permission_context.h

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.h
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.h b/chrome/browser/geolocation/chrome_geolocation_permission_context.h
index 4f480f88146a15eb0ba4a86661c41fe6e3fc1457..86ee9f1910a845a3c8d5e1d659b9c66df0f077bf 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.h
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.h
@@ -35,6 +35,9 @@ class ChromeGeolocationPermissionContext
       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();
 
@@ -81,11 +84,11 @@ class ChromeGeolocationPermissionContext
   // 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);
 };