Merge from Chromium at DEPS revision 40.0.2214.45

This commit was generated by merge_to_master.py.

Change-Id: I2727aa7130d490d425674c5001e18accc1de6b46