diff --git a/media/engine/fake_video_codec_factory.cc b/media/engine/fake_video_codec_factory.cc
index c202fb22c2..8caeb6d61d 100644
--- a/media/engine/fake_video_codec_factory.cc
+++ b/media/engine/fake_video_codec_factory.cc
@@ -12,6 +12,7 @@
 
 #include <memory>
 
+#include "api/environment/environment.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
@@ -30,22 +31,16 @@ static const char kFakeCodecFactoryCodecName[] = "FakeCodec";
 
 namespace webrtc {
 
-FakeVideoEncoderFactory::FakeVideoEncoderFactory() = default;
-
-// static
-std::unique_ptr<VideoEncoder> FakeVideoEncoderFactory::CreateVideoEncoder() {
-  return std::make_unique<test::FakeEncoder>(Clock::GetRealTimeClock());
-}
-
 std::vector<SdpVideoFormat> FakeVideoEncoderFactory::GetSupportedFormats()
     const {
   return std::vector<SdpVideoFormat>(
       1, SdpVideoFormat(kFakeCodecFactoryCodecName));
 }
 
-std::unique_ptr<VideoEncoder> FakeVideoEncoderFactory::CreateVideoEncoder(
+std::unique_ptr<VideoEncoder> FakeVideoEncoderFactory::Create(
+    const Environment& env,
     const SdpVideoFormat& format) {
-  return std::make_unique<test::FakeEncoder>(Clock::GetRealTimeClock());
+  return std::make_unique<test::FakeEncoder>(&env.clock());
 }
 
 FakeVideoDecoderFactory::FakeVideoDecoderFactory() = default;
diff --git a/media/engine/fake_video_codec_factory.h b/media/engine/fake_video_codec_factory.h
index 9494d9c19c..0e26c1ccf5 100644
--- a/media/engine/fake_video_codec_factory.h
+++ b/media/engine/fake_video_codec_factory.h
@@ -14,6 +14,7 @@
 #include <memory>
 #include <vector>
 
+#include "api/environment/environment.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "rtc_base/system/rtc_export.h"
@@ -24,14 +25,12 @@ namespace webrtc {
 // the given bitrate constraints.
 class RTC_EXPORT FakeVideoEncoderFactory : public VideoEncoderFactory {
  public:
-  FakeVideoEncoderFactory();
-
-  static std::unique_ptr<VideoEncoder> CreateVideoEncoder();
+  FakeVideoEncoderFactory() = default;
 
   // VideoEncoderFactory implementation
   std::vector<SdpVideoFormat> GetSupportedFormats() const override;
-  std::unique_ptr<VideoEncoder> CreateVideoEncoder(
-      const SdpVideoFormat& format) override;
+  std::unique_ptr<VideoEncoder> Create(const Environment& env,
+                                       const SdpVideoFormat& format) override;
 };
 
 // Provides a fake video decoder instance that ignores the given bitstream and
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 6d71d84772..b4d6b11490 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -171,8 +171,8 @@ class MockVideoEncoderFactory : public VideoEncoderFactory {
  public:
   std::vector<SdpVideoFormat> GetSupportedFormats() const override;
 
-  std::unique_ptr<VideoEncoder> CreateVideoEncoder(
-      const SdpVideoFormat& format) override;
+  std::unique_ptr<VideoEncoder> Create(const Environment& env,
+                                       const SdpVideoFormat& format) override;
 
   const std::vector<MockVideoEncoder*>& encoders() const;
   void SetEncoderNames(const std::vector<const char*>& encoder_names);
@@ -359,7 +359,8 @@ std::vector<SdpVideoFormat> MockVideoEncoderFactory::GetSupportedFormats()
   return {SdpVideoFormat::VP8()};
 }
 
-std::unique_ptr<VideoEncoder> MockVideoEncoderFactory::CreateVideoEncoder(
+std::unique_ptr<VideoEncoder> MockVideoEncoderFactory::Create(
+    const Environment& env,
     const SdpVideoFormat& format) {
   if (create_video_encoder_return_nullptr_) {
     return nullptr;
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 9c55923f8f..e305de845e 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -320,7 +320,7 @@ std::unique_ptr<VideoEncoder> VideoQualityTest::CreateVideoEncoder(
     encoder = std::make_unique<SimulcastEncoderAdapter>(
         env, encoder_factory_.get(), nullptr, format);
   } else if (format.name == "FakeCodec") {
-    encoder = webrtc::FakeVideoEncoderFactory::CreateVideoEncoder();
+    encoder = FakeVideoEncoderFactory().Create(env, format);
   } else {
     encoder = encoder_factory_->Create(env, format);
   }