Remove ALL usage of CriticalSectionWrapper.

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

Index: webrtc/modules/video_coding/codecs/test/packet_manipulator.h
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
index 3334be072bee3e818d3c6cefc0a3a103a7b1f8fd..9b8585cd2423f91338f7596e6d8d86c58d126528 100644
--- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
+++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
@@ -13,8 +13,8 @@
 
 #include <stdlib.h>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/test/testsupport/packet_reader.h"
 
 namespace webrtc {
@@ -91,7 +91,7 @@ class PacketManipulatorImpl : public PacketManipulator {
   PacketManipulatorImpl(PacketReader* packet_reader,
                         const NetworkingConfig& config,
                         bool verbose);
-  virtual ~PacketManipulatorImpl();
+  ~PacketManipulatorImpl() = default;
   int ManipulatePackets(webrtc::EncodedImage* encoded_image) override;
   virtual void InitializeRandomSeed(unsigned int seed);
 
@@ -104,7 +104,7 @@ class PacketManipulatorImpl : public PacketManipulator {
   const NetworkingConfig& config_;
   // Used to simulate a burst over several frames.
   int active_burst_packets_;
-  CriticalSectionWrapper* critsect_;
+  rtc::CriticalSection critsect_;
   unsigned int random_seed_;
   bool verbose_;
 };