Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector (Relanding)

content/browser/speech/speech_recognition_browsertest.cc

 // Copyright 2013 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.
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 115 matching lines @@
     test_audio_input_controller_factory_.set_delegate(NULL);
     mock_streaming_server_.reset();
   }
 
  private:
   static void FeedSingleBufferToAudioController(
       scoped_refptr<media::TestAudioInputController> controller,
       size_t buffer_size,
       bool fill_with_noise) {
     DCHECK(controller.get());
+    const media::AudioParameters& audio_params = controller->audio_parameters();
     scoped_ptr<uint8[]> audio_buffer(new uint8[buffer_size]);
     if (fill_with_noise) {
       for (size_t i = 0; i < buffer_size; ++i)
         audio_buffer[i] = static_cast<uint8>(127 * sin(i * 3.14F /
             (16 * buffer_size)));
     } else {
       memset(audio_buffer.get(), 0, buffer_size);
     }
-    controller->event_handler()->OnData(controller,
-                                        audio_buffer.get(),
-                                        buffer_size);
+
+    scoped_ptr<media::AudioBus> audio_bus =
+        media::AudioBus::Create(audio_params);
+    audio_bus->FromInterleaved(&audio_buffer.get()[0],
+                               audio_bus->frames(),
+                               audio_params.bits_per_sample() / 8);
+    controller->event_handler()->OnData(controller, audio_bus.get());
   }
 
   void FeedAudioController(int duration_ms, bool feed_with_noise) {
     media::TestAudioInputController* controller =
         test_audio_input_controller_factory_.controller();
     ASSERT_TRUE(controller);
     const media::AudioParameters& audio_params = controller->audio_parameters();
     const size_t buffer_size = audio_params.GetBytesPerBuffer();
     const int ms_per_buffer = audio_params.frames_per_buffer() * 1000 /
                               audio_params.sample_rate();
@@ skipping 36 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, OneShotRecognition) {
   NavigateToURLBlockUntilNavigationsComplete(
       shell(), GetTestUrlFromFragment("oneshot"), 2);
 
   EXPECT_EQ(kClientDisconnected, streaming_server_state());
   EXPECT_EQ("goodresult1", GetPageFragment());
 }
 
 }  // namespace content