Migrate geolocation permissions to the new common permission class.

chrome/browser/geolocation/geolocation_infobar_delegate.h

Index: chrome/browser/geolocation/geolocation_infobar_delegate.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.h b/chrome/browser/geolocation/geolocation_infobar_delegate.h
index 9fb6a12da661253a9a7996c60aefb5627b4194b9..0431487b39ba25808db195017d66d262831526cd 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.h
@@ -7,17 +7,13 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/permission_request_id.h"
-#include "components/infobars/core/confirm_infobar_delegate.h"
-#include "url/gurl.h"
+#include "chrome/browser/content_settings/permission_infobar_delegate.h"
 
-class PermissionQueueController;
-class InfoBarService;
 
 // GeolocationInfoBarDelegates are created by the
 // GeolocationInfoBarQueueController to control the display
 // and handling of geolocation permission infobars to the user.
-class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
+class GeolocationInfoBarDelegate : public PermissionInfobarDelegate {
  public:
   // Creates a geolocation infobar and delegate and adds the infobar to
   // |infobar_service|.  Returns the infobar if it was successfully added.
@@ -35,37 +31,13 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
                              const std::string& display_languages);
   virtual ~GeolocationInfoBarDelegate();
 
-  // ConfirmInfoBarDelegate:
-  virtual bool Accept() OVERRIDE;
-  virtual void InfoBarDismissed() OVERRIDE;
-  virtual int GetIconID() const OVERRIDE;
-  virtual Type GetInfoBarType() const OVERRIDE;
-  virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const OVERRIDE;
+  // PermissionInfoBarDelegate:
   virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
-
-
-  // Call back to the controller, to inform of the user's decision.
-  void SetPermission(bool update_content_setting, bool allowed);
-
-  // Marks a flag internally to indicate that the user has interacted with the
-  // bar. This makes it possible to log from the destructor when the bar has not
-  // been used, i.e. it has been ignored by the user.
-  void set_user_has_interacted() {
-    user_has_interacted_ = true;
-  }
+  virtual int GetIconID() const OVERRIDE;
 
-  PermissionQueueController* controller_;
-  const PermissionRequestID id_;
   GURL requesting_frame_;
-  int contents_unique_id_;
   std::string display_languages_;
 
-  // Whether the user has interacted with the geolocation infobar.
-  bool user_has_interacted_;
-
   DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegate);
 };