Minor refactor to simplify code in content/test/test_content_client.cc

Minor refactor to simplify code in content/test/test_content_client.cc

Addresses review comments from caa7a3dddb27b19eb
BUG=505538
Committed: https://crrev.com/b08c8e9d6ead84d218b055d31e5d728c3eb74476
Cr-Commit-Position: refs/heads/master@{#337393}

[agrieve, 2015-06-30 19:31:00]

agrieve@chromium.org changed reviewers:
+ jcivelli@chromium.org

[agrieve, 2015-07-03 17:16:59]

agrieve@chromium.org changed reviewers:
+ jochen@chromium.org
- jcivelli@chromium.org

[agrieve, 2015-07-03 17:16:59]

jochen@chromium.org: Please review changes in

[jochen (gone - plz use gerrit), 2015-07-06 10:33:37]

lgtm

[agrieve, 2015-07-06 13:44:15]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2015-07-06 13:44:29]

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

[commit-bot: I haz the power, 2015-07-06 13:51:20]

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

[commit-bot: I haz the power, 2015-07-06 13:51:21]

Try jobs failed on following builders:
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)

[agrieve, 2015-07-06 14:04:42]

The CQ bit was checked by agrieve@chromium.org

[agrieve, 2015-07-06 14:04:42]

The patchset sent to the CQ was uploaded after l-g-t-m from jochen@chromium.org
Link to the patchset: https://codereview.chromium.org/1210153008/#ps20001
(title: "fix ios compile")

[commit-bot: I haz the power, 2015-07-06 14:04:58]

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

[commit-bot: I haz the power, 2015-07-06 14:50:55]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-07-06 14:51:49]

Patchset 2 (id:??) landed as
https://crrev.com/b08c8e9d6ead84d218b055d31e5d728c3eb74476
Cr-Commit-Position: refs/heads/master@{#337393}