Migrate geolocation permissions to the new common permission class.

chrome/browser/content_settings/permission_context_base.h

 // Copyright 2014 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_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_
 
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
@@ skipping 45 matching lines @@
 
   // The renderer is requesting permission to push messages.
   // When the answer to a permission request has been determined, |callback|
   // should be called with the result.
   virtual void RequestPermission(content::WebContents* web_contents,
                                  const PermissionRequestID& id,
                                  const GURL& requesting_frame,
                                  bool user_gesture,
                                  const BrowserPermissionCallback& callback);
 
+  // Withdraw an existing permission request, no op if the permission request
+  // was already cancelled by some other means.
+  virtual void CancelPermissionRequest(content::WebContents* web_contents,
+                                       const PermissionRequestID& id);
+
  protected:
   // Decide whether the permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an infobar.
   void DecidePermission(content::WebContents* web_contents,
                         const PermissionRequestID& id,
                         const GURL& requesting_origin,
                         const GURL& embedder_origin,
                         bool user_gesture,
                         const BrowserPermissionCallback& callback);
@@ skipping 15 matching lines @@
 
   // Implementors can override this method to update the icons on the
   // url bar with the result of the new permission.
   virtual void UpdateTabContext(const PermissionRequestID& id,
                                 const GURL& requesting_origin,
                                 bool allowed) {}
 
   // Return an instance of the infobar queue controller, creating it if needed.
   PermissionQueueController* GetQueueController();
 
+  // KeyedService:
+  // Called when the associated profile is destroyed.
+  virtual void Shutdown() OVERRIDE;
+
  private:
   void UpdateContentSetting(
       const GURL& requesting_origin,
       const GURL& embedder_origin,
       bool allowed);
 
   // Called when a bubble is no longer used so it can be cleaned up.
   void CleanUpBubble(const PermissionRequestID& id);
 
   Profile* profile_;
   const ContentSettingsType permission_type_;
   base::WeakPtrFactory<PermissionContextBase> weak_factory_;

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

The WeakPtrFactory should be the last member, to ensure that it will be
destroyed first, which will invalidate weak pointers.

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

Done.

   scoped_ptr<PermissionQueueController> permission_queue_controller_;
   base::ScopedPtrHashMap<std::string, PermissionBubbleRequest>
       pending_bubbles_;
+  bool shutting_down_;
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_