Remove extra_options from VideoCodec.

webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_
 
 #include <algorithm>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/common.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "webrtc/video_frame.h"
 
 #include "gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AllOf;
@@ skipping 110 matching lines @@
 
  private:
   int decoded_frames_;
 };
 
 class SkipEncodingUnusedStreamsTest {
  public:
   std::vector<unsigned int> RunTest(VP8Encoder* encoder,
                                     VideoCodec* settings,
                                     uint32_t target_bitrate) {
-    Config options;
-    SpyingTemporalLayersFactory* spy_factory =
-        new SpyingTemporalLayersFactory();
-    options.Set<TemporalLayers::Factory>(spy_factory);
-    settings->extra_options = &options;
+    SpyingTemporalLayersFactory spy_factory;
+    settings->codecSpecific.VP8.tl_factory = &spy_factory;
     EXPECT_EQ(0, encoder->InitEncode(settings, 1, 1200));
 
     encoder->SetRates(target_bitrate, 30);
 
     std::vector<unsigned int> configured_bitrates;
     for (std::vector<TemporalLayers*>::const_iterator it =
-             spy_factory->spying_layers_.begin();
-         it != spy_factory->spying_layers_.end(); ++it) {
+             spy_factory.spying_layers_.begin();
+         it != spy_factory.spying_layers_.end(); ++it) {
       configured_bitrates.push_back(
           static_cast<SpyingTemporalLayers*>(*it)->configured_bitrate_);
     }
     return configured_bitrates;
   }
 
   class SpyingTemporalLayers : public TemporalLayers {
    public:
     explicit SpyingTemporalLayers(TemporalLayers* layers)
         : configured_bitrate_(0), layers_(layers) {}
@@ skipping 26 matching lines @@
     int CurrentLayerId() const override { return layers_->CurrentLayerId(); }
 
     bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) override {
       return false;
     }
 
     int configured_bitrate_;
     TemporalLayers* layers_;
   };
 
-  class SpyingTemporalLayersFactory : public TemporalLayers::Factory {
+  class SpyingTemporalLayersFactory : public TemporalLayersFactory {
    public:
     virtual ~SpyingTemporalLayersFactory() {}
     TemporalLayers* Create(int temporal_layers,
                            uint8_t initial_tl0_pic_idx) const override {
       SpyingTemporalLayers* layers =
-          new SpyingTemporalLayers(TemporalLayers::Factory::Create(
+          new SpyingTemporalLayers(TemporalLayersFactory::Create(
               temporal_layers, initial_tl0_pic_idx));
       spying_layers_.push_back(layers);
       return layers;
     }
 
     mutable std::vector<TemporalLayers*> spying_layers_;
   };
 };
 
 class TestVp8Simulcast : public ::testing::Test {
@@ skipping 725 matching lines @@
   rtc::scoped_ptr<VP8Decoder> decoder_;
   MockDecodedImageCallback decoder_callback_;
   VideoCodec settings_;
   VideoFrame input_frame_;
 };
 
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_