Fix clang/win build more after https://codereview.chromium.org/1471123002

Fix clang/win build more after https://codereview.chromium.org/1471123002

Also remove a few Windows newlines :-/

BUG=560836
TBR=jam@chromium.org

Committed: https://crrev.com/dcbb834462ebeac05c273eb780ef91b5ea629bc5
Cr-Commit-Position: refs/heads/master@{#361344}

[Nico, 2015-11-24 15:17:40]

The windows newlines only show up in "show raw diff". How could these get in
there? Shouldn't we have a presubmit for those?

[Nico, 2015-11-24 15:17:43]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2015-11-24 15:18:10]

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

[commit-bot: I haz the power, 2015-11-24 15:20:48]

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

[commit-bot: I haz the power, 2015-11-24 15:20:48]

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

[commit-bot: I haz the power, 2015-11-24 15:28:04]

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

[Nico, 2015-11-24 15:32:44]

(looks like the cq can't handle patches with windows newline changes)