Merge from Chromium at DEPS revision 30.0.1599.50

This commit was generated by merge_to_master.py.

Change-Id: I0bef17f85aec68fea425bb85892b9d0d5ed4efbf
6 files changed