Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc

Index: chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc
diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc
index 53f7fc5b970f4e9c95e8231fc6ae804495e32358..2761e781f855cf27d04a1adb19565c19bb97c604 100644
--- a/chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc
+++ b/chrome/browser/media/protected_media_identifier_infobar_delegate_android.cc
@@ -20,7 +20,7 @@ infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegateAndroid::Create(
     Profile* profile,
     const PermissionSetCallback& callback) {
   return infobar_service->AddInfoBar(
-      CreatePermissionInfoBar(std::unique_ptr<PermissionInfobarDelegate>(
+      CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
           new ProtectedMediaIdentifierInfoBarDelegateAndroid(
               requesting_frame, user_gesture, profile, callback))));
 }
@@ -31,14 +31,13 @@ ProtectedMediaIdentifierInfoBarDelegateAndroid::
         bool user_gesture,
         Profile* profile,
         const PermissionSetCallback& callback)
-    : PermissionInfobarDelegate(
+    : PermissionInfoBarDelegate(
           requesting_frame,
           content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,
           CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
           user_gesture,
           profile,
-          callback),
-      requesting_frame_(requesting_frame) {}
+          callback) {}
 
 ProtectedMediaIdentifierInfoBarDelegateAndroid::
     ~ProtectedMediaIdentifierInfoBarDelegateAndroid() {}
@@ -52,11 +51,6 @@ int ProtectedMediaIdentifierInfoBarDelegateAndroid::GetIconId() const {
   return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
 }
 
-int ProtectedMediaIdentifierInfoBarDelegateAndroid::GetMessageResourceId()
-    const {
-  return IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
-}
-
 base::string16 ProtectedMediaIdentifierInfoBarDelegateAndroid::GetLinkText()
     const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
@@ -65,3 +59,8 @@ base::string16 ProtectedMediaIdentifierInfoBarDelegateAndroid::GetLinkText()
 GURL ProtectedMediaIdentifierInfoBarDelegateAndroid::GetLinkURL() const {
   return GURL(chrome::kEnhancedPlaybackNotificationLearnMoreURL);
 }
+
+int ProtectedMediaIdentifierInfoBarDelegateAndroid::GetMessageResourceId()
+    const {
+  return IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
+}