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

media/gpu/video_decode_accelerator_unittest.cc

Index: media/gpu/video_decode_accelerator_unittest.cc
diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
index e9c2d04a8180bf4d39593570174256456ac6869a..cb4260ec2ea77d3a6834d6b63a95c4f58c201f2f 100644
--- a/media/gpu/video_decode_accelerator_unittest.cc
+++ b/media/gpu/video_decode_accelerator_unittest.cc
@@ -1256,8 +1256,8 @@ static void AssertWaitForStateOrDeleted(
   if (state == expected_state)
     return;
   ASSERT_TRUE(client->decoder_deleted())
-      << "Decoder not deleted but Wait() returned " << state << ", instead of "
-      << expected_state;
+      << "Decoder not deleted but Wait() returned " << state
+      << ", instead of " << expected_state;
 }
 
 // We assert a minimal number of concurrent decoders we expect to succeed.
@@ -1317,13 +1317,23 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) {
       delay_after_frame_num = video_file->num_frames - kMaxFramesToDelayReuse;
     }
 
-    GLRenderingVDAClient* client = new GLRenderingVDAClient(
-        index, &rendering_helper_, note, video_file->data_str,
-        num_in_flight_decodes, num_play_throughs,
-        video_file->reset_after_frame_num, delete_decoder_state,
-        video_file->width, video_file->height, video_file->profile,
-        g_fake_decoder, suppress_rendering, delay_after_frame_num, 0,
-        render_as_thumbnails);
+    GLRenderingVDAClient* client =
+        new GLRenderingVDAClient(index,
+                                 &rendering_helper_,
+                                 note,
+                                 video_file->data_str,
+                                 num_in_flight_decodes,
+                                 num_play_throughs,
+                                 video_file->reset_after_frame_num,
+                                 delete_decoder_state,
+                                 video_file->width,
+                                 video_file->height,
+                                 video_file->profile,
+                                 g_fake_decoder,
+                                 suppress_rendering,
+                                 delay_after_frame_num,
+                                 0,
+                                 render_as_thumbnails);
 
     clients[index] = client;
     helper_params.window_sizes.push_back(
@@ -1429,10 +1439,13 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) {
     if (match == golden_md5s.end()) {
       // Convert raw RGB into PNG for export.
       std::vector<unsigned char> png;
-      gfx::PNGCodec::Encode(&rgb[0], gfx::PNGCodec::FORMAT_RGB,
+      gfx::PNGCodec::Encode(&rgb[0],
+                            gfx::PNGCodec::FORMAT_RGB,
                             kThumbnailsPageSize,
-                            kThumbnailsPageSize.width() * 3, true,
-                            std::vector<gfx::PNGCodec::Comment>(), &png);
+                            kThumbnailsPageSize.width() * 3,
+                            true,
+                            std::vector<gfx::PNGCodec::Comment>(),
+                            &png);
 
       LOG(ERROR) << "Unknown thumbnails MD5: " << md5_string;
 
@@ -1595,13 +1608,23 @@ TEST_F(VideoDecodeAcceleratorTest, TestDecodeTimeMedian) {
 
   ClientStateNotification<ClientState>* note =
       new ClientStateNotification<ClientState>();
-  GLRenderingVDAClient* client = new GLRenderingVDAClient(
-      0, &rendering_helper_, note, test_video_files_[0]->data_str, 1, 1,
-      test_video_files_[0]->reset_after_frame_num, CS_RESET,
-      test_video_files_[0]->width, test_video_files_[0]->height,
-      test_video_files_[0]->profile, g_fake_decoder, true,
-      std::numeric_limits<int>::max(), kWebRtcDecodeCallsPerSecond,
-      false /* render_as_thumbnail */);
+  GLRenderingVDAClient* client =
+    new GLRenderingVDAClient(0,
+                             &rendering_helper_,
+                             note,
+                             test_video_files_[0]->data_str,
+                             1,
+                             1,
+                             test_video_files_[0]->reset_after_frame_num,
+                             CS_RESET,
+                             test_video_files_[0]->width,
+                             test_video_files_[0]->height,
+                             test_video_files_[0]->profile,
+                             g_fake_decoder,
+                             true,
+                             std::numeric_limits<int>::max(),
+                             kWebRtcDecodeCallsPerSecond,
+                             false /* render_as_thumbnail */);
   helper_params.window_sizes.push_back(
       gfx::Size(test_video_files_[0]->width, test_video_files_[0]->height));
   InitializeRenderingHelper(helper_params);