Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/geolocation/geolocation_infobar_delegate_android.cc

Index: chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
index 33a4917f0cfed0c812882749286caa6f0ed6fa40..d2c6bb86aaa3656f9562d9d129b35d752aebc30b 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
@@ -18,7 +18,7 @@ infobars::InfoBar* GeolocationInfoBarDelegateAndroid::Create(
     Profile* profile,
     const PermissionSetCallback& callback) {
   return infobar_service->AddInfoBar(
-      CreatePermissionInfoBar(std::unique_ptr<PermissionInfobarDelegate>(
+      CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
           new GeolocationInfoBarDelegateAndroid(requesting_frame, user_gesture,
                                                 profile, callback))));
 }
@@ -28,13 +28,12 @@ GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid(
     bool user_gesture,
     Profile* profile,
     const PermissionSetCallback& callback)
-    : PermissionInfobarDelegate(requesting_frame,
-                                content::PermissionType::GEOLOCATION,
-                                CONTENT_SETTINGS_TYPE_GEOLOCATION,
-                                user_gesture,
-                                profile,
-                                callback),
-      requesting_frame_(requesting_frame) {}
+    : SinglePermissionInfoBarDelegate(requesting_frame,
+                                      content::PermissionType::GEOLOCATION,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      user_gesture,
+                                      profile,
+                                      callback) {}
 
 GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {}