Use a TestBrowserThreadBundle in WebContentsAudioInputStreamTest

content/browser/media/capture/web_contents_audio_input_stream_unittest.cc

 // Copyright (c) 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 "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
-#include "content/browser/browser_thread_impl.h"
 #include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/media/capture/web_contents_tracker.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "media/audio/simple_sources.h"
 #include "media/audio/virtual_audio_input_stream.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::DoAll;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
@@ skipping 143 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioInputCallback);
 };
 
 }  // namespace
 
 class WebContentsAudioInputStreamTest : public testing::Test {
  public:
   WebContentsAudioInputStreamTest()
-      : audio_thread_("Audio thread"),
-        io_thread_(BrowserThread::IO),
+      : thread_bundle_(TestBrowserThreadBundle::REAL_IO_THREAD),
+        audio_thread_("Audio thread"),
         mock_mirroring_manager_(new MockAudioMirroringManager()),
         mock_tracker_(new MockWebContentsTracker()),
         mock_vais_(NULL),
         wcais_(NULL),
         destination_(NULL),
         current_render_process_id_(kRenderProcessId),
         current_render_view_id_(kRenderViewId),
         on_data_event_(false, false) {
     audio_thread_.Start();
-    io_thread_.Start();
   }
 
   virtual ~WebContentsAudioInputStreamTest() {
     audio_thread_.Stop();
-    io_thread_.Stop();
 
     DCHECK(!mock_vais_);
     DCHECK(!wcais_);
     EXPECT_FALSE(destination_);
     DCHECK(streams_.empty());
     DCHECK(sources_.empty());
   }
 
   void Open() {
     mock_vais_ =
@@ skipping 155 matching lines @@
   // Block the calling thread until OnData() callbacks are being made.
   void WaitForData() {
     // Note: Arbitrarily chosen, but more iterations causes tests to take
     // significantly more time.
     static const int kNumIterations = 3;
     for (int i = 0; i < kNumIterations; ++i)
       on_data_event_.Wait();
   }
 
  private:
+  TestBrowserThreadBundle thread_bundle_;
   base::Thread audio_thread_;
-  BrowserThreadImpl io_thread_;
 
   scoped_ptr<MockAudioMirroringManager> mock_mirroring_manager_;
   scoped_refptr<MockWebContentsTracker> mock_tracker_;
 
   MockVirtualAudioInputStream* mock_vais_;  // Owned by wcais_.
   WebContentsAudioInputStream* wcais_;  // Self-destructs on Close().
 
   // Mock consumer of audio data.
   MockAudioInputCallback mock_input_callback_;
 
@@ skipping 120 matching lines @@
   WaitForData();
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   WaitForData();
   RUN_ON_AUDIO_THREAD(ChangeMirroringTarget);
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   RUN_ON_AUDIO_THREAD(Stop);
   RUN_ON_AUDIO_THREAD(Close);
 }
 
 }  // namespace content