Revert of I cannot remember what the race here actually was.

Revert of I cannot remember what the race here actually was. (patchset #1 id:1 of https://codereview.chromium.org/922873002/)

Reason for revert:
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN/builds/1557/steps/dm/logs/stdio

Original issue's description:
> I cannot remember what the race here actually was.
> 
> Removing SkTRacy will show us, or perhaps show us we already fixed the race.
> 
> BUG=chromium:437511
> 
> No public API changes.
> TBR=reed@google.com
> 
> Committed: https://skia.googlesource.com/skia/+/71409c83e69b387b3c5d567197d0421c36baf68d

TBR=bungeman@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:437511
Committed: https://skia.googlesource.com/skia/+/0a62ad734ccd5e52f5e08afd64c3d758711315d5

[mtklein, 2015-02-12 23:31:50]

Created Revert of I cannot remember what the race here actually was.

[commit-bot: I haz the power, 2015-02-12 23:32:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/923543003/1

[commit-bot: I haz the power, 2015-02-12 23:32:10]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/0a62ad734ccd5e52f5e08afd64c3d758711315d5