minor readability / refactors

minor readability / refactors

I have been hacking at this test trying to understand why the N5 is
still sometimes crashy (it seems, less but not zero now). No luck so far.

But, while I've been reading and hacking at it, I think I've made a
few small improvements, mostly to readability.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/2f6bb6b85246314dd016ecf68bbfd9b48319117a

[mtklein_C, 2015-01-22 23:01:01]

mtklein@chromium.org changed reviewers:
+ jvanverth@google.com

[mtklein, 2015-01-22 23:02:48]

mtklein@google.com changed reviewers:
+ mtklein@google.com

[mtklein, 2015-01-22 23:02:49]

Oh, actually, I think I was reading the buildbots wrong!  It does look like that
last CL fixed things...

[mtklein, 2015-01-22 23:02:57]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2015-01-22 23:03:22]

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

[commit-bot: I haz the power, 2015-01-22 23:03:22]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-01-23 05:03 UTC

[commit-bot: I haz the power, 2015-01-23 00:54:36]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-01-23 06:54 UTC

[commit-bot: I haz the power, 2015-01-23 06:54:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-23 06:54:41]

No LGTM from a valid reviewer yet. Please ask for an LGTM from a
full Skia committer from
https://skia.googlesource.com/skia/+/master/CQ_COMMITTERS

[jvanverth1, 2015-01-23 13:44:43]

lgtm

[mtklein, 2015-01-23 13:46:59]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2015-01-23 13:47:43]

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

[commit-bot: I haz the power, 2015-01-23 13:47:59]

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