Revert 236008 "Revert 236006 "Revert 236005 "Fixing Chromeos bui..."

> Revert 236006 "Revert 236005 "Fixing Chromeos build.""
> 
> > Revert 236005 "Fixing Chromeos build."
> > 
> > > Fixing Chromeos build.
> > > 
> > > TBR=jochen
> > > 
> > > BUG=318120
> > > 
> > > Review URL: https://codereview.chromium.org/64953006
> > 
> > TBR=finnur@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/73733006
> 
> TBR=finnur@chromium.org
> 
> Review URL: https://codereview.chromium.org/66313009

TBR=finnur@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236012 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 236012