un-revert 36487 (re-committing 36486) and move the missing baselines.

  BUG=none
  TEST=none
  TBR=victorw@chromium.org


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