Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ an…

Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ and vector id versions don't coexist on any single platform.

BUG=651270
Review-Url: https://codereview.chromium.org/2385063005
Cr-Commit-Position: refs/heads/master@{#425577}
(cherry picked from commit 20c051a9a415b64187d410d0ec207c0442d784f5)

Committed: https://chromium.googlesource.com/chromium/src/+/089cf6d16f3733ff8c78767c56bd8856e6695d09

[Evan Stade, 2016-10-27 15:38:34]

Description was changed from

==========
Make PermissionRequest::GetIconId return different types on desktop and Android
so that the IDR_ and vector id versions don't coexist on any single platform.

BUG=651270

Review-Url: https://codereview.chromium.org/2385063005
Cr-Commit-Position: refs/heads/master@{#425577}
(cherry picked from commit 20c051a9a415b64187d410d0ec207c0442d784f5)
==========

to

==========
Make PermissionRequest::GetIconId return different types on desktop and Android
so that the IDR_ and vector id versions don't coexist on any single platform.

BUG=651270

Review-Url: https://codereview.chromium.org/2385063005
Cr-Commit-Position: refs/heads/master@{#425577}
(cherry picked from commit 20c051a9a415b64187d410d0ec207c0442d784f5)

Committed:
https://chromium.googlesource.com/chromium/src/+/089cf6d16f3733ff8c78767c56bd...
==========

[Evan Stade, 2016-10-27 15:38:35]

Committed patchset #1 (id:1) manually as
089cf6d16f3733ff8c78767c56bd8856e6695d09.