Rename SetProcessParams -> SetTestConfig.

webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h

Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
index ab355f02043f203fa8b2c41ec9986dc26762d665..382ac2a6ac182b4403e57201e214f1eafe1fea25 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h
@@ -569,25 +569,22 @@ class VideoProcessorIntegrationTest : public testing::Test {
     }
   }
 
-  static void SetProcessParams(TestConfig* config,
-                               bool hw_codec,
-                               bool use_single_core,
-                               float packet_loss_probability,
-                               int key_frame_interval,
-                               std::string filename,
-                               bool verbose_logging,
-                               bool batch_mode) {
-    // Configure input filename.
+  static void SetTestConfig(TestConfig* config,
+                            bool hw_codec,
+                            bool use_single_core,
+                            float packet_loss_probability,
+                            std::string filename,
+                            bool verbose_logging,
+                            bool batch_mode) {
     config->filename = filename;
     config->input_filename = ResourcePath(filename, "yuv");
     // Generate an output filename in a safe way.
     config->output_filename =
         TempFilename(OutputPath(), "videoprocessor_integrationtest");
-    config->hw_codec = hw_codec;
-    config->use_single_core = use_single_core;
-    config->keyframe_interval = key_frame_interval;
     config->networking_config.packet_loss_probability = packet_loss_probability;

[brandtr, 2017/08/09 10:55:31]

Reordered to match definitions in TestConfig.

+    config->use_single_core = use_single_core;
     config->verbose = verbose_logging;
+    config->hw_codec = hw_codec;
     config->batch_mode = batch_mode;
   }
 
@@ -605,29 +602,29 @@ class VideoProcessorIntegrationTest : public testing::Test {
     config->codec_settings.width = width;
     config->codec_settings.height = height;
     switch (config->codec_settings.codecType) {
-      case kVideoCodecH264:
-        config->codec_settings.H264()->frameDroppingOn = frame_dropper_on;
-        config->codec_settings.H264()->keyFrameInterval = kBaseKeyFrameInterval;
-        break;
       case kVideoCodecVP8:
-        config->codec_settings.VP8()->errorConcealmentOn = error_concealment_on;
-        config->codec_settings.VP8()->denoisingOn = denoising_on;
+        config->codec_settings.VP8()->resilience =

[brandtr, 2017/08/09 10:55:31]

Reordered to match definitions in VideoCodecVP8

+            resilience_on ? kResilientStream : kResilienceOff;
         config->codec_settings.VP8()->numberOfTemporalLayers =
             num_temporal_layers;
-        config->codec_settings.VP8()->frameDroppingOn = frame_dropper_on;
+        config->codec_settings.VP8()->denoisingOn = denoising_on;
+        config->codec_settings.VP8()->errorConcealmentOn = error_concealment_on;
         config->codec_settings.VP8()->automaticResizeOn = spatial_resize_on;
+        config->codec_settings.VP8()->frameDroppingOn = frame_dropper_on;
         config->codec_settings.VP8()->keyFrameInterval = kBaseKeyFrameInterval;
-        config->codec_settings.VP8()->resilience =
-            resilience_on ? kResilientStream : kResilienceOff;
         break;
       case kVideoCodecVP9:
-        config->codec_settings.VP9()->denoisingOn = denoising_on;
+        config->codec_settings.VP9()->resilienceOn = resilience_on;
         config->codec_settings.VP9()->numberOfTemporalLayers =
             num_temporal_layers;
+        config->codec_settings.VP9()->denoisingOn = denoising_on;
         config->codec_settings.VP9()->frameDroppingOn = frame_dropper_on;
-        config->codec_settings.VP9()->automaticResizeOn = spatial_resize_on;
         config->codec_settings.VP9()->keyFrameInterval = kBaseKeyFrameInterval;
-        config->codec_settings.VP9()->resilienceOn = resilience_on;
+        config->codec_settings.VP9()->automaticResizeOn = spatial_resize_on;
+        break;
+      case kVideoCodecH264:
+        config->codec_settings.H264()->frameDroppingOn = frame_dropper_on;
+        config->codec_settings.H264()->keyFrameInterval = kBaseKeyFrameInterval;
         break;
       default:
         RTC_NOTREACHED();