Introduce new interface for MediaInternals updates.

content/browser/media/media_internals_unittest.cc

Index: content/browser/media/media_internals_unittest.cc
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index 173ba36539f3bb486051a806a20a4011df87c1fd..dea4c9032caec86941fa208c320fb2a90a558def 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -5,173 +5,158 @@
 #include "content/browser/media/media_internals.h"
 
 #include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/stringprintf.h"
-#include "content/public/test/test_browser_thread.h"
+#include "base/bind_helpers.h"
+#include "base/json/json_reader.h"
+#include "base/run_loop.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content {
 namespace {
-
-class MockObserverBaseClass {
- public:
-  ~MockObserverBaseClass() {}
-  virtual void OnUpdate(const string16& javascript) = 0;
-};
-
-class MockMediaInternalsObserver : public MockObserverBaseClass {
- public:
-  virtual ~MockMediaInternalsObserver() {}
-  MOCK_METHOD1(OnUpdate, void(const string16& javascript));
-};
-
+const int kTestComponentID = 0;
+const char kTestInputDeviceID[] = "test-input-id";
+const char kTestOutputDeviceID[] = "test-output-id";
 }  // namespace
 
-class MediaInternalsTest : public testing::Test {
- public:
-  MediaInternalsTest() : io_thread_(BrowserThread::IO, &loop_) {}
-  base::DictionaryValue* data() {
-    return &internals_->data_;
-  }
-
-  void DeleteItem(const std::string& item) {
-    internals_->DeleteItem(item);
-  }
+namespace content {
 
-  void UpdateItem(const std::string& item, const std::string& property,
-                  base::Value* value) {
-    internals_->UpdateItem(std::string(), item, property, value);
+class MediaInternalsTest
+    : public testing::TestWithParam<media::AudioLogFactory::AudioComponent> {
+ public:
+  MediaInternalsTest()
+      : media_internals_(MediaInternals::GetInstance()),
+        update_cb_(base::Bind(&MediaInternalsTest::UpdateCallbackImpl,
+                              base::Unretained(this))),
+        test_params_(media::AudioParameters::AUDIO_PCM_LINEAR,
+                     media::CHANNEL_LAYOUT_MONO,
+                     48000,
+                     16,
+                     128),
+        test_component_(GetParam()),
+        audio_log_(media_internals_->CreateAudioLog(test_component_)) {
+    media_internals_->AddUpdateCallback(update_cb_);
   }
 
-  void SendUpdate(const std::string& function, base::Value* value) {
-    internals_->SendUpdate(function, value);
+  virtual ~MediaInternalsTest() {
+    media_internals_->RemoveUpdateCallback(update_cb_);
   }
 
  protected:
-  virtual void SetUp() {
-    internals_.reset(new MediaInternals());
+  // Extracts and deserializes the JSON update data; merges into |update_data_|.
+  void UpdateCallbackImpl(const string16& update) {
+    std::string utf8_update = base::UTF16ToUTF8(update);
+    const std::string::size_type first_brace = utf8_update.find('{');

[acolwell GONE FROM CHROMIUM, 2013/11/22 21:01:21]

Why do we need this?!? What other data is in this string?

[DaleCurtis, 2013/11/22 21:16:03]

string16 content::WebUI::GetJavascriptCall("my_func", base::DictionaryValue)
turns into: "my_func({key:value,key:value,key:value});" which is passed to each
UpdateCallback().

Ultimately all this is passed to
RenderViewHost::ExecuteJavascriptInWebFrame(string16(), <update>); inside of
MediaInternalsMessageHandler.

+    const std::string::size_type last_brace = utf8_update.rfind('}');
+    scoped_ptr<base::Value> output_value(base::JSONReader::Read(
+        utf8_update.substr(first_brace, last_brace - first_brace + 1)));
+    CHECK(output_value);
+
+    base::DictionaryValue* output_dict = NULL;
+    CHECK(output_value->GetAsDictionary(&output_dict));
+    update_data_.MergeDictionary(output_dict);
   }
 
-  base::MessageLoop loop_;
-  TestBrowserThread io_thread_;
-  scoped_ptr<MediaInternals> internals_;
+  TestBrowserThreadBundle thread_bundle_;
+  MediaInternals* const media_internals_;
+  MediaInternals::UpdateCallback update_cb_;
+  base::DictionaryValue update_data_;
+  const media::AudioParameters test_params_;
+  const media::AudioLogFactory::AudioComponent test_component_;
+  scoped_ptr<media::AudioLog> audio_log_;
 };
 
-TEST_F(MediaInternalsTest, AudioStreamCreatedSendsMessage) {
-  media::AudioParameters params =
-      media::AudioParameters(media::AudioParameters::AUDIO_PCM_LINEAR,
-                             media::CHANNEL_LAYOUT_MONO,
-                             48000,
-                             16,
-                             129);
-
-  const int stream_id = 0;
-  const std::string device_id = "test";
-  const std::string name =
-      base::StringPrintf("audio_streams.%p:%d", this, stream_id);
-
-  internals_->OnAudioStreamCreated(this, stream_id, params, device_id);
+TEST_P(MediaInternalsTest, AudioLogCreateStartStopErrorClose) {
+  audio_log_->OnCreated(
+      kTestComponentID, test_params_, kTestInputDeviceID, kTestOutputDeviceID);
+  base::RunLoop().RunUntilIdle();
 
   std::string channel_layout;
-  data()->GetString(name + ".channel_layout", &channel_layout);
-  EXPECT_EQ("MONO", channel_layout);
-
-  int sample_rate;
-  data()->GetInteger(name + ".sample_rate", &sample_rate);
-  EXPECT_EQ(params.sample_rate(), sample_rate);
-
-  int frames_per_buffer;
-  data()->GetInteger(name + ".frames_per_buffer", &frames_per_buffer);
-  EXPECT_EQ(params.frames_per_buffer(), frames_per_buffer);
-
-  int output_channels;
-  data()->GetInteger(name + ".output_channels", &output_channels);
-  EXPECT_EQ(params.channels(), output_channels);
-
-  std::string device_id_out;
-  data()->GetString(name + ".input_device_id", &device_id_out);
-  EXPECT_EQ(device_id, device_id_out);
-
-  int input_channels;
-  data()->GetInteger(name + ".input_channels", &input_channels);
-  EXPECT_EQ(params.input_channels(), input_channels);
+  ASSERT_TRUE(update_data_.GetString("output_channel_layout", &channel_layout));
+  EXPECT_EQ(media::ChannelLayoutToString(test_params_.channel_layout()),
+            channel_layout);
+
+  int sample_rate = 0;
+  ASSERT_TRUE(update_data_.GetInteger("sample_rate", &sample_rate));
+  EXPECT_EQ(test_params_.sample_rate(), sample_rate);
+
+  int frames_per_buffer = 0;
+  ASSERT_TRUE(update_data_.GetInteger("frames_per_buffer", &frames_per_buffer));
+  EXPECT_EQ(test_params_.frames_per_buffer(), frames_per_buffer);
+
+  int output_channels = 0;
+  ASSERT_TRUE(update_data_.GetInteger("output_channels", &output_channels));
+  EXPECT_EQ(test_params_.channels(), output_channels);
+
+  int input_channels = 0;
+  ASSERT_TRUE(update_data_.GetInteger("input_channels", &input_channels));
+  EXPECT_EQ(test_params_.input_channels(), input_channels);
+
+  std::string output_device_id_out;
+  ASSERT_TRUE(
+      update_data_.GetString("output_device_id", &output_device_id_out));
+  EXPECT_EQ(kTestOutputDeviceID, output_device_id_out);
+
+  std::string input_device_id_out;
+  ASSERT_TRUE(update_data_.GetString("input_device_id", &input_device_id_out));
+  EXPECT_EQ(kTestInputDeviceID, input_device_id_out);
+
+  int component_id = 0;
+  ASSERT_TRUE(update_data_.GetInteger("component_id", &component_id));
+  EXPECT_EQ(kTestComponentID, component_id);
+
+  int component_type = 0;
+  ASSERT_TRUE(update_data_.GetInteger("component_type", &component_type));
+  EXPECT_EQ(test_component_, component_type);
+
+  std::string status;
+  ASSERT_TRUE(update_data_.GetString("status", &status));
+  EXPECT_EQ("created", status);
+
+  // Verify OnStarted().
+  audio_log_->OnStarted(kTestComponentID);
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(update_data_.GetString("status", &status));
+  EXPECT_EQ("started", status);
+
+  // Verify OnStopped().
+  audio_log_->OnStopped(kTestComponentID);
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(update_data_.GetString("status", &status));

[acolwell GONE FROM CHROMIUM, 2013/11/22 21:01:21]

nit: This ASSERT_TRUE & EXPECT_EQ appears to be repeated several times. How
about an ExpectStatus("stopped") helper?

[DaleCurtis, 2013/11/22 21:16:03]

Seems reasonable. I'll add it.

+  EXPECT_EQ("stopped", status);
+
+  // Verify OnError().
+  audio_log_->OnError(kTestComponentID);
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(update_data_.GetString("error_occurred", &status));
+  EXPECT_EQ("true", status);
+
+  // Verify OnClosed().
+  audio_log_->OnClosed(kTestComponentID);
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(update_data_.GetString("status", &status));
+  EXPECT_EQ("closed", status);
 }
 
-TEST_F(MediaInternalsTest, UpdateAddsNewItem) {
-  UpdateItem("some.item", "testing", new base::FundamentalValue(true));
-  bool testing = false;
-  std::string id;
-
-  EXPECT_TRUE(data()->GetBoolean("some.item.testing", &testing));
-  EXPECT_TRUE(testing);
-
-  EXPECT_TRUE(data()->GetString("some.item.id", &id));
-  EXPECT_EQ(id, "some.item");
+TEST_P(MediaInternalsTest, AudioLogCreateClose) {
+  audio_log_->OnCreated(
+      kTestComponentID, test_params_, kTestInputDeviceID, kTestOutputDeviceID);
+  base::RunLoop().RunUntilIdle();
+  std::string status;
+  ASSERT_TRUE(update_data_.GetString("status", &status));
+  EXPECT_EQ("created", status);
+
+  audio_log_->OnClosed(kTestComponentID);
+  base::RunLoop().RunUntilIdle();
+  ASSERT_TRUE(update_data_.GetString("status", &status));
+  EXPECT_EQ("closed", status);
 }
 
-TEST_F(MediaInternalsTest, UpdateModifiesExistingItem) {
-  UpdateItem("some.item", "testing", new base::FundamentalValue(true));
-  UpdateItem("some.item", "value", new base::FundamentalValue(5));
-  UpdateItem("some.item", "testing", new base::FundamentalValue(false));
-  bool testing = true;
-  int value = 0;
-  std::string id;
-
-  EXPECT_TRUE(data()->GetBoolean("some.item.testing", &testing));
-  EXPECT_FALSE(testing);
-
-  EXPECT_TRUE(data()->GetInteger("some.item.value", &value));
-  EXPECT_EQ(value, 5);
-
-  EXPECT_TRUE(data()->GetString("some.item.id", &id));
-  EXPECT_EQ(id, "some.item");
-}
-
-TEST_F(MediaInternalsTest, ObserversReceiveNotifications) {
-  scoped_ptr<MockMediaInternalsObserver> observer(
-      new MockMediaInternalsObserver());
-
-  EXPECT_CALL(*observer.get(), OnUpdate(testing::_)).Times(1);
-
-  MediaInternals::UpdateCallback callback = base::Bind(
-      &MockMediaInternalsObserver::OnUpdate, base::Unretained(observer.get()));
-
-  internals_->AddUpdateCallback(callback);
-  SendUpdate("fn", data());
-}
-
-TEST_F(MediaInternalsTest, RemovedObserversReceiveNoNotifications) {
-  scoped_ptr<MockMediaInternalsObserver> observer(
-      new MockMediaInternalsObserver());
-
-  EXPECT_CALL(*observer.get(), OnUpdate(testing::_)).Times(0);
-
-  MediaInternals::UpdateCallback callback = base::Bind(
-      &MockMediaInternalsObserver::OnUpdate, base::Unretained(observer.get()));
-
-  internals_->AddUpdateCallback(callback);
-  internals_->RemoveUpdateCallback(callback);
-  SendUpdate("fn", data());
-}
-
-TEST_F(MediaInternalsTest, DeleteRemovesItem) {
-  base::Value* out;
-
-  UpdateItem("some.item", "testing", base::Value::CreateNullValue());
-  EXPECT_TRUE(data()->Get("some.item", &out));
-  EXPECT_TRUE(data()->Get("some", &out));
-
-  DeleteItem("some.item");
-  EXPECT_FALSE(data()->Get("some.item", &out));
-  EXPECT_TRUE(data()->Get("some", &out));
-
-  DeleteItem("some");
-  EXPECT_FALSE(data()->Get("some.item", &out));
-  EXPECT_FALSE(data()->Get("some", &out));
-}
+INSTANTIATE_TEST_CASE_P(
+    MediaInternalsTest, MediaInternalsTest, testing::Values(
+        media::AudioLogFactory::AudioComponent::AUDIO_INPUT_CONTROLLER,
+        media::AudioLogFactory::AudioComponent::AUDIO_OUTPUT_CONTROLLER,
+        media::AudioLogFactory::AudioComponent::AUDIO_OUTPUT_STREAM));
 
 }  // namespace content