Remove shadowing variables in blink/platform

I'm interested in avoiding and possibly banning shadowed variables since I think that might
possibly prevent jumbo problems. This patch resolves all current issues of shadowed
variables in blink/platform, mostly through natural renamings or refactorings.

The exact warnings this patch avoids are a bit too many to list here but is available at

Bug: 925310                                               ^

Change-Id: I9f94b4facb075db6b5860e9e942caddc1c51faee
Commit-Queue: Daniel Bratell <>
Reviewed-by: Kentaro Hara <>
Cr-Commit-Position: refs/heads/master@{#633235}
13 files changed