Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / main / test / target_delay_unittest.cc

diff --git a/src/third_party/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc b/src/third_party/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc
index f01e6ff..5636bdf 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc
+++ b/src/third_party/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc
@@ -9,7 +9,6 @@
  */
 
 #include "gtest/gtest.h"
-#include "webrtc/common.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
@@ -22,11 +21,9 @@
 
 namespace webrtc {
 
-
-class TargetDelayTest {
- public:
-  explicit TargetDelayTest(const Config& config)
-      : acm_(config.Get<AudioCodingModuleFactory>().Create(0)) {}
+class TargetDelayTest : public ::testing::Test {
+ protected:
+  TargetDelayTest() : acm_(AudioCodingModule::Create(0)) {}
 
   ~TargetDelayTest() {}
 
@@ -202,65 +199,24 @@ class TargetDelayTest {
   uint8_t payload_[kPayloadLenBytes];
 };
 
-
-namespace {
-
-TargetDelayTest* CreateLegacy() {
-  Config config;
-  UseLegacyAcm(&config);
-  TargetDelayTest* test = new TargetDelayTest(config);
-  test->SetUp();
-  return test;
+TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(OutOfRangeInput)) {
+  OutOfRangeInput();
 }
 
-TargetDelayTest* CreateNew() {
-  Config config;
-  UseNewAcm(&config);
-  TargetDelayTest* test = new TargetDelayTest(config);
-  test->SetUp();
-  return test;
+TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(NoTargetDelayBufferSizeChanges)) {
+  NoTargetDelayBufferSizeChanges();
 }
 
-}  // namespace
-
-TEST(TargetDelayTest, DISABLED_ON_ANDROID(OutOfRangeInput)) {
-  scoped_ptr<TargetDelayTest> test(CreateLegacy());
-  test->OutOfRangeInput();
-
-  test.reset(CreateNew());
-  test->OutOfRangeInput();
+TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(WithTargetDelayBufferNotChanging)) {
+  WithTargetDelayBufferNotChanging();
 }
 
-TEST(TargetDelayTest, DISABLED_ON_ANDROID(NoTargetDelayBufferSizeChanges)) {
-  scoped_ptr<TargetDelayTest> test(CreateLegacy());
-  test->NoTargetDelayBufferSizeChanges();
-
-  test.reset(CreateNew());
-  test->NoTargetDelayBufferSizeChanges();
+TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(RequiredDelayAtCorrectRange)) {
+  RequiredDelayAtCorrectRange();
 }
 
-TEST(TargetDelayTest, DISABLED_ON_ANDROID(WithTargetDelayBufferNotChanging)) {
-  scoped_ptr<TargetDelayTest> test(CreateLegacy());
-  test->WithTargetDelayBufferNotChanging();
-
-  test.reset(CreateNew());
-  test->WithTargetDelayBufferNotChanging();
-}
-
-TEST(TargetDelayTest, DISABLED_ON_ANDROID(RequiredDelayAtCorrectRange)) {
-  scoped_ptr<TargetDelayTest> test(CreateLegacy());
-  test->RequiredDelayAtCorrectRange();
-
-  test.reset(CreateNew());
-  test->RequiredDelayAtCorrectRange();
-}
-
-TEST(TargetDelayTest, DISABLED_ON_ANDROID(TargetDelayBufferMinMax)) {
-  scoped_ptr<TargetDelayTest> test(CreateLegacy());
-  test->TargetDelayBufferMinMax();
-
-  test.reset(CreateNew());
-  test->TargetDelayBufferMinMax();
+TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(TargetDelayBufferMinMax)) {
+  TargetDelayBufferMinMax();
 }
 
 }  // namespace webrtc