Make PermissionRequest::GetIconId return different types

chrome/browser/permissions/permission_update_infobar_delegate_android.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 
 #include <memory>
 
 #include "base/android/jni_array.h"
 #include "base/callback_helpers.h"
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
+#include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/PermissionUpdateInfoBarDelegate_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::JavaParamRef;
 
 // static
@@ skipping 121 matching lines @@
   Java_PermissionUpdateInfoBarDelegate_onNativeDestroyed(
       base::android::AttachCurrentThread(), java_delegate_);
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 PermissionUpdateInfoBarDelegate::GetIdentifier() const {
   return PERMISSION_UPDATE_INFOBAR_DELEGATE;
 }
 
 int PermissionUpdateInfoBarDelegate::GetIconId() const {
-  return IDR_INFOBAR_WARNING;
+  return IDR_ANDROID_INFOBAR_WARNING;
 }
 
 base::string16 PermissionUpdateInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(permission_msg_id_);
 }
 
 int PermissionUpdateInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
@@ skipping 10 matching lines @@
 }
 
 bool PermissionUpdateInfoBarDelegate::Cancel() {
   base::ResetAndReturn(&callback_).Run(false);
   return true;
 }
 
 void PermissionUpdateInfoBarDelegate::InfoBarDismissed() {
   base::ResetAndReturn(&callback_).Run(false);
 }