Fix for bug 5152544, remove warning from chromium port

This is a cherry-pick of http://codereview.chromium.org/8354008/
No more warnings after this is merged.

Change-Id: I788d28545e7961d0145a3f1273ce4302f8c432ad
2 files changed