Revert 78660 - We need to revert both jam's first patch and his build fix, as it didn't fix everything.
Revert 78660 - We need to revert both jam's first patch and his build fix, as it didn't fix everything.

Revert 78645 - Fix build break

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/6714007

TBR=ericu@google.com
Review URL: http://codereview.chromium.org/6709020

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@78661 0039d316-1c4b-4281-b951-d872f2087c98

gavinp/chromium,gavinp/chromium,Crystalnix/house-of-life-chromium,Crystalnix/house-of-life-chromium,adobe/chromium,yitian134/chromium,yitian134/chromium,Crystalnix/house-of-life-chromium,gavinp/chromium,ropik/chromium,gavinp/chromium,Crystalnix/house-of-life-chromium,Crystalnix/house-of-life-chromium,adobe/chromium,yitian134/chromium,ropik/chromium,adobe/chromium,yitian134/chromium,adobe/chromium,adobe/chromium,Crystalnix/house-of-life-chromium,Crystalnix/house-of-life-chromium,adobe/chromium,ropik/chromium,Crystalnix/house-of-life-chromium,gavinp/chromium,gavinp/chromium,ropik/chromium,gavinp/chromium,Crystalnix/house-of-life-chromium,gavinp/chromium,ropik/chromium,ropik/chromium,adobe/chromium,adobe/chromium,yitian134/chromium,yitian134/chromium,gavinp/chromium,yitian134/chromium,yitian134/chromium,adobe/chromium,Crystalnix/house-of-life-chromium,adobe/chromium,yitian134/chromium,ropik/chromium,ropik/chromium,Crystalnix/house-of-life-chromium,ropik/chromium,gavinp/chromium,yitian134/chromium,adobe/chromium