commit df4883dbf02d02085af9f0f9952fe376a1bdb7d3
author Magnus Jedvert <magjed@webrtc.org> Fri Nov 17 13:44:55 2017
committer Commit Bot <commit-bot@chromium.org> Sat Nov 18 10:48:28 2017
tree e026a0c4e478e5b4bba856cc60eb92bcb4748b2e
parent f90b4573871373567a7b7a26729345c6b205e89b

Reland "Update internal encoder factory to new interface"

This is a reland of 2c8c8e26fc58a0f2789b7a5cd2646a8319c14d3e
Original change's description:
> Update internal encoder factory to new interface
>
> TBR=stefan@webrtc.org
>
> Bug: webrtc:7925
> Change-Id: I0bb97acdf0d58a9ce531ecdd672bb17ef96360df
> Reviewed-on: https://webrtc-review.googlesource.com/21162
> Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> Reviewed-by: Anders Carlsson <andersc@webrtc.org>
> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20717}

TBR=andersc@webrtc.org,brandt@webrtc.org,stefan@webrtc.org

Bug: webrtc:7925
Change-Id: I0d269b3edb029e372a36c3b461a577bca2b6d0cb
Reviewed-on: https://webrtc-review.googlesource.com/24000
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20747}

video/picture_id_tests.cc

diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc
index cfe4332..f1545d8 100644
--- a/video/picture_id_tests.cc
+++ b/video/picture_id_tests.cc
@@ -346,7 +346,7 @@
 
 TEST_P(PictureIdTest,
        PictureIdContinuousAfterReconfigureSimulcastEncoderAdapter) {
-  cricket::InternalEncoderFactory internal_encoder_factory;
+  InternalEncoderFactory internal_encoder_factory;
   SimulcastEncoderAdapter simulcast_encoder_adapter(&internal_encoder_factory);
   SetupEncoder(&simulcast_encoder_adapter);
   TestPictureIdContinuousAfterReconfigure({1, 3, 3, 1, 1});
@@ -354,7 +354,7 @@
 
 TEST_P(PictureIdTest,
        PictureIdIncreasingAfterRecreateStreamSimulcastEncoderAdapter) {
-  cricket::InternalEncoderFactory internal_encoder_factory;
+  InternalEncoderFactory internal_encoder_factory;
   SimulcastEncoderAdapter simulcast_encoder_adapter(&internal_encoder_factory);
   SetupEncoder(&simulcast_encoder_adapter);
   TestPictureIdIncreaseAfterRecreateStreams({1, 3, 3, 1, 1});
@@ -368,7 +368,7 @@
   // If forced fallback is enabled, the picture id is set in the PayloadRouter
   // and the sequence should be continuous.
   if (GetParam() == kVp8ForcedFallbackEncoderEnabled) {
-    cricket::InternalEncoderFactory internal_encoder_factory;
+    InternalEncoderFactory internal_encoder_factory;
     SimulcastEncoderAdapter simulcast_encoder_adapter(
         &internal_encoder_factory);
     // Make sure that that the picture id is not reset if the stream count goes