Update all non-slow, non-skip tests to match how they run on the bots.
Update all non-slow, non-skip tests to match how they run on the bots.

Also didn't touch lines that claimed to only fail on the trybots or cause other tests
to fail.

TBR=adamk@chromium.org

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

git-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@155064 bbb929c8-8fbe-4397-9dbb-9b2b20218538

axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk,axinging/chromium-crosswalk