Merge to M45: Turn a failing assert into an actual check.

BUG=522131
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1327913002 .

(cherry picked from commit 640c395fa9b76552383ccd0c5f4668ea698089f6)

Review URL: https://codereview.chromium.org/1333013002 .
1 file changed