Fix places that trigger no-unused-lambda-capture - change to using static-constexpr

webrtc/pc/channel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1187 matching lines @@
     EXPECT_TRUE(media_channel1_->sending());
     if (verify_playout_) {
       EXPECT_TRUE(media_channel2_->playout());
     }
     EXPECT_TRUE(media_channel2_->sending());
   }
 
   // Tests that when the transport channel signals a candidate pair change
   // event, the media channel will receive a call on the network route change.
   void TestNetworkRouteChanges() {
-    // These would have been declared as constexpr, but then some compilers
-    // require them to be captured in the lambda, and other compilers complain
-    // about no-ununused-lambda-capture. Keeping them as normal variables was
-    // the easiest work-around.
-    uint16_t kLocalNetId = 1;
-    uint16_t kRemoteNetId = 2;
-    int kLastPacketId = 100;
+    static constexpr uint16_t kLocalNetId = 1;
+    static constexpr uint16_t kRemoteNetId = 2;
+    static constexpr int kLastPacketId = 100;
 
     CreateChannels(0, 0);
 
     typename T::MediaChannel* media_channel1 =
         static_cast<typename T::MediaChannel*>(channel1_->media_channel());
     ASSERT_TRUE(media_channel1);
 
     media_channel1->set_num_network_route_changes(0);
     network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
       // The transport channel becomes disconnected.
       fake_rtp_dtls_transport1_->ice_transport()
           ->SignalSelectedCandidatePairChanged(
               fake_rtp_dtls_transport1_->ice_transport(), nullptr, -1, false);
     });
     WaitForThreads();
     EXPECT_EQ(1, media_channel1->num_network_route_changes());
     EXPECT_FALSE(media_channel1->last_network_route().connected);
     media_channel1->set_num_network_route_changes(0);
 
-    network_thread_->Invoke<void>(RTC_FROM_HERE, [this,
-                                                  kLocalNetId, kRemoteNetId,
-                                                  kLastPacketId] {
+    network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
       // The transport channel becomes connected.
       rtc::SocketAddress local_address("192.168.1.1", 1000 /* port number */);
       rtc::SocketAddress remote_address("192.168.1.2", 2000 /* port number */);
       auto candidate_pair = cricket::FakeCandidatePair::Create(
           local_address, kLocalNetId, remote_address, kRemoteNetId);
       fake_rtp_dtls_transport1_->ice_transport()
           ->SignalSelectedCandidatePairChanged(
               fake_rtp_dtls_transport1_->ice_transport(), candidate_pair.get(),
               kLastPacketId, true);
     });
@@ skipping 2656 matching lines @@
   ASSERT_TRUE(voice_channel_.Init_w(nullptr, nullptr, &fake_rtp_dtls_transport_,
                                     &fake_rtcp_dtls_transport_));
   EXPECT_DEATH(voice_channel_.SetTransports(&fake_rtp_dtls_transport_,
                                             &fake_rtp_dtls_transport_),
                "");
 }
 
 #endif  // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // TODO(pthatcher): TestSetReceiver?