GitLab

BUG=135179,135779
TEST=All tests pass, chrome runs and resources are inlined correctly.

Review URL: https://chromiumcodereview.appspot.com/10826032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148580 0039d316-1c4b-4281-b951-d872f2087c98