Return from |Configure()| asynchronously, and allow |InitBuffers()| to return errors.

ppapi/tests/test_media_stream_audio_track.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Tests PPB_MediaStreamAudioTrack interface.
 
 #include "ppapi/tests/test_media_stream_audio_track.h"
 
 #include "ppapi/c/private/ppb_testing_private.h"
 #include "ppapi/cpp/audio_buffer.h"
@@ skipping 58 matching lines @@
   return true;
 }
 
 TestMediaStreamAudioTrack::~TestMediaStreamAudioTrack() {
 }
 
 void TestMediaStreamAudioTrack::RunTests(const std::string& filter) {
   RUN_TEST(Create, filter);
   RUN_TEST(GetBuffer, filter);
   RUN_TEST(Configure, filter);
+  RUN_TEST(ConfigureClose, filter);
 }
 
 void TestMediaStreamAudioTrack::HandleMessage(const pp::Var& message) {
   if (message.is_resource()) {
     audio_track_ = pp::MediaStreamAudioTrack(message.AsResource());
   }
   event_.Signal();
 }
 
 std::string TestMediaStreamAudioTrack::TestCreate() {
@@ skipping 108 matching lines @@
 std::string TestMediaStreamAudioTrack::TestConfigure() {
   // Create a track.
   instance_->EvalScript(kJSCode);
   event_.Wait();
   event_.Reset();
 
   ASSERT_FALSE(audio_track_.is_null());
   ASSERT_FALSE(audio_track_.HasEnded());
   ASSERT_FALSE(audio_track_.GetId().empty());
 
+  // Perform a |Configure()| with no attributes. This ends up making an IPC
+  // call, but the host implementation has a fast-path when there are no changes
+  // to the configuration. This test is intended to hit that fast-path and make
+  // sure it works correctly.
+  {
+    int32_t attrib_list[] = {
+      PP_MEDIASTREAMAUDIOTRACK_ATTRIB_NONE,
+    };
+    ASSERT_SUBTEST_SUCCESS(CheckConfigure(attrib_list, PP_OK));
+  }
+
   // Configure number of buffers.
   struct {
     int32_t buffers;
     int32_t expect_result;
   } buffers[] = {
     { 8, PP_OK },
     { 100, PP_OK },
     { kMaxNumberOfBuffers, PP_OK },
     { -1, PP_ERROR_BADARGUMENT },
     { kMaxNumberOfBuffers + 1, PP_OK },  // Clipped to max value.
@@ skipping 69 matching lines @@
     ASSERT_EQ(PP_ERROR_INPROGRESS, cc_configure.result());
     audio_track_.RecycleBuffer(buffer);
   }
 
   // Close the track.
   audio_track_.Close();
   ASSERT_TRUE(audio_track_.HasEnded());
   audio_track_ = pp::MediaStreamAudioTrack();
   PASS();
 }
+
+std::string TestMediaStreamAudioTrack::TestConfigureClose() {
+  // Create a track.
+  instance_->EvalScript(kJSCode);
+  event_.Wait();
+  event_.Reset();
+
+  ASSERT_FALSE(audio_track_.is_null());
+  ASSERT_FALSE(audio_track_.HasEnded());
+  ASSERT_FALSE(audio_track_.GetId().empty());
+
+  // Configure the audio track and close it immediately. The Configure() call
+  // should complete.
+  int32_t attrib_list[] = {
+    PP_MEDIASTREAMAUDIOTRACK_ATTRIB_BUFFERS, 10,
+    PP_MEDIASTREAMAUDIOTRACK_ATTRIB_NONE,
+  };
+  TestCompletionCallback cc_configure(instance_->pp_instance(), false);
+  int32_t result = audio_track_.Configure(attrib_list,
+                                          cc_configure.GetCallback());
+  ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
+  audio_track_.Close();
+  cc_configure.WaitForResult(result);
+  result = cc_configure.result();
+  // Unfortunately, we can't control whether the configure succeeds or is
+  // aborted.
+  ASSERT_TRUE(result == PP_OK || result == PP_ERROR_ABORTED);
+
+  PASS();
+}