Fix places that trigger no-unused-lambda-capture

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 5ef5845940dd00d31ec07dba50ab5a3331ce2a2e..e5a2022aa6e552643dd8e896a52af4110376a514 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2962,8 +2962,8 @@ TEST_F(EndToEndTest, MAYBE_ContentTypeSwitches) {
   Call::Config recv_config(test.GetReceiverCallConfig());
   VideoEncoderConfig encoder_config_with_screenshare;
 
-  task_queue_.SendTask([this, &test, &override_field_trials, &send_config,
-                        &recv_config, &encoder_config_with_screenshare]() {
+  task_queue_.SendTask([this, &test, &send_config, &recv_config,
+                        &encoder_config_with_screenshare]() {
     CreateSenderCall(send_config);
     CreateReceiverCall(recv_config);
 
@@ -4269,9 +4269,13 @@ TEST_F(EndToEndTest, MAYBE_TestFlexfecRtpStatePreservation) {
     rtc::CriticalSection crit_;
   } observer;
 
-  constexpr int kFrameMaxWidth = 320;
-  constexpr int kFrameMaxHeight = 180;
-  constexpr int kFrameRate = 15;
+  // These would have been declared as constexpr, but then some compilers
+  // require them to be captured in the lambda, and other compilers complain

[nisse-webrtc, 2017/08/23 09:42:02]

If I understood you correctly, it's some windows compiler which is the exception
(and probably buggy), requiring the constants to be included in the capture
list. So if it's a workaround for a compiler bug, be a bit more explicit about
which compiler is broken.

[eladalon, 2017/08/23 10:26:26]

Might take some time. I suggest lgtm-izing this CL, unblocking some internal
projects, and landing a fix of the comment afterwards. (I'll get to work finding
out which compiler it is right away.)

+  // about no-ununused-lambda-capture. Keeping them as normal variables was
+  // the easiest work-around.
+  int kFrameMaxWidth = 320;

[stefan-webrtc, 2017/08/23 09:37:25]

const?

[eladalon, 2017/08/23 10:26:26]

Same answer.

+  int kFrameMaxHeight = 180;
+  int kFrameRate = 15;
 
   Call::Config config(event_log_.get());