media/gpu: restore some of the reformatting done during migration to media/gpu.

media/gpu/vaapi_video_decode_accelerator.cc

Index: media/gpu/vaapi_video_decode_accelerator.cc
diff --git a/media/gpu/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi_video_decode_accelerator.cc
index 8f1c2bc4a9e793883bdc70c7a00ecc31542621f7..1fe508f478f3510ed43e5bcc3b21b93e7de2856d 100644
--- a/media/gpu/vaapi_video_decode_accelerator.cc
+++ b/media/gpu/vaapi_video_decode_accelerator.cc
@@ -34,6 +34,8 @@ namespace {
 // UMA errors that the VaapiVideoDecodeAccelerator class reports.
 enum VAVDADecoderFailure {
   VAAPI_ERROR = 0,
+  // UMA requires that max passed to UMA_HISTOGRAM_ENUMERATION must be greater
+  // than 1.

[Mark Dittmer, 2016/05/12 14:13:51]

Ditto.

[Pawel Osciak, 2016/05/13 06:07:22]

Acknowledged.

   VAVDA_DECODER_FAILURES_MAX,
 };
 }
@@ -411,8 +413,8 @@ void VaapiVideoDecodeAccelerator::OutputPicture(
   // Notify the client a picture is ready to be displayed.
   ++num_frames_at_client_;
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
-  DVLOG(4) << "Notifying output picture id " << output_id << " for input "
-           << input_id << " is ready";
+  DVLOG(4) << "Notifying output picture id " << output_id
+           << " for input " << input_id << " is ready";
   // TODO(posciak): Use visible size from decoder here instead
   // (crbug.com/402760). Passing (0, 0) results in the client using the
   // visible size extracted from the container instead.
@@ -502,7 +504,7 @@ bool VaapiVideoDecodeAccelerator::GetInputBuffer_Locked() {
       // already queued up. Otherwise will stop decoding.
       if (input_buffers_.empty())
         return false;
-    // else fallthrough
+      // else fallthrough
     case kDecoding:
     case kIdle:
       DCHECK(!input_buffers_.empty());
@@ -709,7 +711,7 @@ void VaapiVideoDecodeAccelerator::Decode(
       break;
 
     case kDecoding:
-    // Decoder already running, fallthrough.
+      // Decoder already running, fallthrough.
     case kResetting:
       // When resetting, allow accumulating bitstream buffers, so that
       // the client can queue after-seek-buffers while we are finishing with
@@ -743,11 +745,10 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
   while (!output_buffers_.empty())
     output_buffers_.pop();
 
-  RETURN_AND_NOTIFY_ON_FAILURE(buffers.size() >= requested_num_pics_,
-                               "Got an invalid number of picture buffers. (Got "
-                                   << buffers.size() << ", requested "
-                                   << requested_num_pics_ << ")",
-                               INVALID_ARGUMENT, );
+  RETURN_AND_NOTIFY_ON_FAILURE(
+      buffers.size() >= requested_num_pics_,
+      "Got an invalid number of picture buffers. (Got " << buffers.size()
+      << ", requested " << requested_num_pics_ << ")", INVALID_ARGUMENT, );
   DCHECK(requested_pic_size_ == buffers[0].size());
 
   std::vector<VASurfaceID> va_surface_ids;