Remove direct usage of BrowserThreadImpl in tests

content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
 #include "content/browser/renderer_host/media/media_stream_ui_controller.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/common/media_stream_request.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace content {
 
 class MediaStreamDeviceUIControllerTest
     : public ::testing::Test,
       public SettingsRequester {
@@ skipping 12 matching lines @@
                                          "mic_id",
                                          0,
                                          0));
     devices->push_back(MediaStreamDevice(MEDIA_DEVICE_VIDEO_CAPTURE,
                                          "camera",
                                          "camera_id"));
   }
 
  protected:
   virtual void SetUp() {
-    message_loop_.reset(new base::MessageLoopForIO);
-    ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
-                                           message_loop_.get()));
-    io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
-                                           message_loop_.get()));
     ui_controller_.reset(new MediaStreamUIController(this));
   }
 
   virtual void TearDown() { base::RunLoop().RunUntilIdle(); }
 
   void CreateDummyRequest(const std::string& label, bool audio, bool video) {
     int dummy_render_process_id = 1;
     int dummy_render_view_id = 1;
     StreamOptions components(audio, video );
     GURL security_origin;
     ui_controller_->MakeUIRequest(label,
                                   dummy_render_process_id,
                                   dummy_render_view_id,
                                   components,
                                   security_origin,
                                   MEDIA_GENERATE_STREAM,
                                   std::string());
   }
 
-  std::unique_ptr<base::MessageLoop> message_loop_;
-  std::unique_ptr<BrowserThreadImpl> ui_thread_;
-  std::unique_ptr<BrowserThreadImpl> io_thread_;
+  TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<MediaStreamUIController> ui_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDeviceUIControllerTest);
 };
 
 TEST_F(MediaStreamDeviceUIControllerTest, GenerateRequest) {
   const std::string label = "dummy_label";
   CreateDummyRequest(label, true, false);
 
@@ skipping 74 matching lines @@
   EXPECT_CALL(*this, DevicesAccepted(label_1, _));
   EXPECT_CALL(*this, DevicesAccepted(label_2, _));
 
   base::RunLoop().RunUntilIdle();
 
   ui_controller_->NotifyUIIndicatorDevicesClosed(label_1);
   ui_controller_->NotifyUIIndicatorDevicesClosed(label_2);
 }
 
 }  // namespace content