Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / copresence / mediums / audio / audio_recorder_unittest.cc

diff --git a/src/components/copresence/mediums/audio/audio_recorder_unittest.cc b/src/components/copresence/mediums/audio/audio_recorder_unittest.cc
index e45c668..08abe93 100644 (file)
--- a/src/components/copresence/mediums/audio/audio_recorder_unittest.cc
+++ b/src/components/copresence/mediums/audio/audio_recorder_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/aligned_memory.h"
 #include "base/run_loop.h"
+#include "components/copresence/mediums/audio/audio_recorder_impl.h"
 #include "components/copresence/public/copresence_constants.h"
 #include "components/copresence/test/audio_test_support.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -22,17 +23,17 @@ class TestAudioInputStream : public media::AudioInputStream {
   TestAudioInputStream(const media::AudioParameters& params,
                        const std::vector<float*> channel_data,
                        size_t samples)
-      : callback_(NULL), params_(params) {
+      : callback_(nullptr), params_(params) {
     buffer_ = media::AudioBus::CreateWrapper(2);
     for (size_t i = 0; i < channel_data.size(); ++i)
       buffer_->SetChannelData(i, channel_data[i]);
     buffer_->set_frames(samples);
   }
 
-  virtual ~TestAudioInputStream() {}
+  ~TestAudioInputStream() override {}
 
-  virtual bool Open() OVERRIDE { return true; }
-  virtual void Start(AudioInputCallback* callback) OVERRIDE {
+  bool Open() override { return true; }
+  void Start(AudioInputCallback* callback) override {
     DCHECK(callback);
     callback_ = callback;
     media::AudioManager::Get()->GetTaskRunner()->PostTask(
@@ -40,14 +41,14 @@ class TestAudioInputStream : public media::AudioInputStream {
         base::Bind(&TestAudioInputStream::SimulateRecording,
                    base::Unretained(this)));
   }
-  virtual void Stop() OVERRIDE {}
-  virtual void Close() OVERRIDE {}
-  virtual double GetMaxVolume() OVERRIDE { return 1.0; }
-  virtual void SetVolume(double volume) OVERRIDE {}
-  virtual double GetVolume() OVERRIDE { return 1.0; }
-  virtual void SetAutomaticGainControl(bool enabled) OVERRIDE {}
-  virtual bool GetAutomaticGainControl() OVERRIDE { return true; }
-  virtual bool IsMuted() OVERRIDE { return false; }
+  void Stop() override {}
+  void Close() override {}
+  double GetMaxVolume() override { return 1.0; }
+  void SetVolume(double volume) override {}
+  double GetVolume() override { return 1.0; }
+  void SetAutomaticGainControl(bool enabled) override {}
+  bool GetAutomaticGainControl() override { return true; }
+  bool IsMuted() override { return false; }
 
  private:
   void SimulateRecording() {
@@ -72,12 +73,12 @@ namespace copresence {
 
 class AudioRecorderTest : public testing::Test {
  public:
-  AudioRecorderTest() : total_samples_(0), recorder_(NULL) {
+  AudioRecorderTest() : total_samples_(0), recorder_(nullptr) {
     if (!media::AudioManager::Get())
       media::AudioManager::CreateForTesting();
   }
 
-  virtual ~AudioRecorderTest() {
+  ~AudioRecorderTest() override {
     DeleteRecorder();
     for (size_t i = 0; i < channel_data_.size(); ++i)
       base::AlignedFree(channel_data_[i]);
@@ -85,9 +86,9 @@ class AudioRecorderTest : public testing::Test {
 
   void CreateSimpleRecorder() {
     DeleteRecorder();
-    recorder_ = new AudioRecorder(
+    recorder_ = new AudioRecorderImpl();
+    recorder_->Initialize(
         base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
-    recorder_->Initialize();
   }
 
   void CreateRecorder(size_t channels,
@@ -108,19 +109,19 @@ class AudioRecorderTest : public testing::Test {
 
     total_samples_ = samples;
 
-    recorder_ = new AudioRecorder(
-        base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
+    recorder_ = new AudioRecorderImpl();
     recorder_->set_input_stream_for_testing(
         new TestAudioInputStream(params_, channel_data_, samples));
     recorder_->set_params_for_testing(new media::AudioParameters(params_));
-    recorder_->Initialize();
+    recorder_->Initialize(
+        base::Bind(&AudioRecorderTest::DecodeSamples, base::Unretained(this)));
   }
 
   void DeleteRecorder() {
     if (!recorder_)
       return;
     recorder_->Finalize();
-    recorder_ = NULL;
+    recorder_ = nullptr;
   }
 
   void RecordAndVerifySamples() {
@@ -181,7 +182,8 @@ class AudioRecorderTest : public testing::Test {
   media::AudioParameters params_;
   size_t total_samples_;
 
-  AudioRecorder* recorder_;
+  // Deleted by calling Finalize() on the object.
+  AudioRecorderImpl* recorder_;
 
   std::string received_samples_;