update .clang-format

generated by version 3.8.1
local changes from --style=Google

3a4
> # Generated with clang-format 3.8.1
10c11
< AlignTrailingComments: true
---
> AlignTrailingComments: false
15,16c16,17
< AllowShortIfStatementsOnASingleLine: true
< AllowShortLoopsOnASingleLine: true
---
> AllowShortIfStatementsOnASingleLine: false
> AllowShortLoopsOnASingleLine: false
37c38
< BreakBeforeTernaryOperators: true
---
> BreakBeforeTernaryOperators: false

Change-Id: I4ded7e36fb8bd5407cfba6d1c4f86e0bec620c0c

webm_parser/demo/demo.cc

@@ -1132,7 +1132,8 @@ class DemoCallback : public Callback {
 int main(int argc, char* argv[]) {
   if ((argc != 1 && argc != 2) ||
       (argc == 2 && argv[1] == std::string("--help"))) {
-    std::cerr << "Usage:\n" << argv[0] << " [path-to-webm-file]\n\n"
+    std::cerr << "Usage:\n"
+              << argv[0] << " [path-to-webm-file]\n\n"
               << "Prints info for the WebM file specified in the command line. "
                  "If no file is\n"
               << "specified, stdin is used as input.\n";

webm_parser/include/webm/istream_reader.h

@@ -45,8 +45,7 @@ class IstreamReader : public Reader {
    reference derived from `std::istream`.
    */
   template <typename T>
-  explicit IstreamReader(T&& istream)
-      : istream_(new T(std::move(istream))) {}
+  explicit IstreamReader(T&& istream) : istream_(new T(std::move(istream))) {}
 
   /**
    Constructs a new reader by moving the provided reader into the new reader.

webm_parser/src/ancestory.h

@@ -60,7 +60,7 @@ class Ancestory {
   // Constructs an Ancestory using the first count elements of ancestory.
   // ancestory must have static storage duration.
   template <std::size_t N>
-  Ancestory(const Id(&ancestory)[N], std::size_t count)
+  Ancestory(const Id (&ancestory)[N], std::size_t count)
       : begin_(ancestory), end_(ancestory + count) {
     assert(count <= N);
   }

webm_parser/src/master_value_parser.h

@@ -180,7 +180,7 @@ class MasterValueParser : public ElementParser {
     // If called, OnParseStarted will be called on the parent element when this
     // particular element is encountered.
     constexpr SingleChildFactory<Parser, Value, TagUseAsStart, Tags...>
-        UseAsStartEvent() const {
+    UseAsStartEvent() const {
       return {id_, member_};
     }
 
@@ -188,7 +188,7 @@ class MasterValueParser : public ElementParser {
     // particular element is fully parsed.
     constexpr SingleChildFactory<Parser, Value, TagNotifyOnParseComplete,
                                  Tags...>
-        NotifyOnParseComplete() const {
+    NotifyOnParseComplete() const {
       return {id_, member_};
     }
 
@@ -227,7 +227,7 @@ class MasterValueParser : public ElementParser {
     // If called, OnParseStarted will be called on the parent element when this
     // particular element is encountered.
     constexpr RepeatedChildFactory<Parser, Value, TagUseAsStart, Tags...>
-        UseAsStartEvent() const {
+    UseAsStartEvent() const {
       return {id_, member_};
     }
 
@@ -235,7 +235,7 @@ class MasterValueParser : public ElementParser {
     // particular element is fully parsed.
     constexpr RepeatedChildFactory<Parser, Value, TagNotifyOnParseComplete,
                                    Tags...>
-        NotifyOnParseComplete() const {
+    NotifyOnParseComplete() const {
       return {id_, member_};
     }
 
@@ -423,7 +423,7 @@ class MasterValueParser : public ElementParser {
   template <typename Parser, typename Value, typename... Tags, typename F>
   static typename std::enable_if<!std::is_constructible<Parser, Value>::value,
                                  std::unique_ptr<ElementParser>>::type
-      MakeChildParser(MasterValueParser* parent, F consume_element_value, ...) {
+  MakeChildParser(MasterValueParser* parent, F consume_element_value, ...) {
     return std::unique_ptr<ElementParser>(new ChildParser<Parser, F, Tags...>(
         parent, std::move(consume_element_value)));
   }
@@ -433,8 +433,8 @@ class MasterValueParser : public ElementParser {
   template <typename Parser, typename Value, typename... Tags, typename F>
   static typename std::enable_if<std::is_constructible<Parser, Value>::value,
                                  std::unique_ptr<ElementParser>>::type
-      MakeChildParser(MasterValueParser* parent, F consume_element_value,
-                      const Element<Value>* default_value) {
+  MakeChildParser(MasterValueParser* parent, F consume_element_value,
+                  const Element<Value>* default_value) {
     return std::unique_ptr<ElementParser>(new ChildParser<Parser, F, Tags...>(
         parent, std::move(consume_element_value), default_value->value()));
   }
@@ -444,8 +444,8 @@ class MasterValueParser : public ElementParser {
   template <typename Parser, typename Value, typename... Tags, typename F>
   static typename std::enable_if<std::is_constructible<Parser, Value>::value,
                                  std::unique_ptr<ElementParser>>::type
-      MakeChildParser(MasterValueParser* parent, F consume_element_value,
-                      const std::vector<Element<Value>>* member) {
+  MakeChildParser(MasterValueParser* parent, F consume_element_value,
+                  const std::vector<Element<Value>>* member) {
     Value default_value{};
     if (!member->empty()) {
       default_value = member->front().value();

webm_parser/tests/istream_reader_test.cc

@@ -23,7 +23,7 @@ namespace {
 // Creates a std::array from a string literal (and omits the trailing
 // NUL-character).
 template <std::size_t N>
-std::array<std::uint8_t, N - 1> ArrayFromString(const char(&string)[N]) {
+std::array<std::uint8_t, N - 1> ArrayFromString(const char (&string)[N]) {
   std::array<std::uint8_t, N - 1> array;
   std::copy_n(string, N - 1, array.begin());
   return array;