I ran it through clang-format-diff.py. The files themselves are not entirely formatted acording to clang-format, so I didn't want to introduce a large set of unrelated changes. Not sure why that wasn't reformatted by clang-format-diff.py. http://reviews.llvm.org/D4005