[content] Follow-up to crrev.com/c/1261816.

Fix post-commit comments from gab@ in crrev.com/c/1261816:
- s/task_environment_.GetMainThreadTaskRunner/ThreadTaskRunnerHandle::Get/.
- std::move for pointers.
- C++11-style init for ScopedTaskEnviroment for UI and IO.

R=gab@chromium.org,jochen@chromium.org

BUG=892139,891670

Change-Id: I8403c53b34a5cfc2ef358eee982de88b60ec74cc
Reviewed-on: https://chromium-review.googlesource.com/c/1286144Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600834}

content/browser/host_zoom_map_impl_unittest.cc

@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,8 +20,7 @@ namespace content {
 class HostZoomMapTest : public testing::Test {
  public:
   HostZoomMapTest()
-      : ui_thread_(BrowserThread::UI,
-                   task_environment_.GetMainThreadTaskRunner()) {}
+      : ui_thread_(BrowserThread::UI, base::ThreadTaskRunnerHandle::Get()) {}
 
  protected:
   base::test::ScopedTaskEnvironment task_environment_;

content/browser/loader/throttling_resource_handler_unittest.cc

@@ -176,9 +176,7 @@ class TestResourceThrottle : public ResourceThrottle {
 class ThrottlingResourceHandlerTest : public testing::Test {
  public:
   ThrottlingResourceHandlerTest()
-      : task_environment_(
-            base::test::ScopedTaskEnvironment::MainThreadType::IO),
-        never_started_url_request_(
+      : never_started_url_request_(
             request_context_.CreateRequest(GURL(kInitialUrl),
                                            net::DEFAULT_PRIORITY,
                                            &never_started_url_request_delegate_,
@@ -224,7 +222,8 @@ class ThrottlingResourceHandlerTest : public testing::Test {
 
  protected:
   // Needs to be first, so it's destroyed last.
-  base::test::ScopedTaskEnvironment task_environment_;
+  base::test::ScopedTaskEnvironment task_environment_{
+      base::test::ScopedTaskEnvironment::MainThreadType::IO};
 
   // Machinery to construct a URLRequest that's just used as an argument to
   // methods that expect one, and is never actually started.

content/browser/media/midi_host_unittest.cc

@@ -13,7 +13,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_task_environment.h"
 #include "content/common/media/midi_messages.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "media/midi/midi_manager.h"
 #include "media/midi/midi_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -117,11 +117,7 @@ class MidiHostForTesting : public MidiHost {
 
 class MidiHostTest : public testing::Test {
  public:
-  MidiHostTest()
-      : io_browser_thread_(BrowserThread::IO,
-                           task_environment_.GetMainThreadTaskRunner()),
-        data_(kNoteOn, kNoteOn + arraysize(kNoteOn)),
-        port_id_(0) {
+  MidiHostTest() : data_(kNoteOn, kNoteOn + base::size(kNoteOn)), port_id_(0) {
     std::unique_ptr<FakeMidiManagerFactory> factory =
         std::make_unique<FakeMidiManagerFactory>();
     factory_ = factory->GetWeakPtr();
@@ -174,8 +170,7 @@ class MidiHostTest : public testing::Test {
   }
 
  private:
-  base::test::ScopedTaskEnvironment task_environment_;
-  TestBrowserThread io_browser_thread_;
+  TestBrowserThreadBundle thread_bundle_;
 
   std::vector<uint8_t> data_;
   int32_t port_id_;

content/browser/streams/stream_url_request_job_unittest.cc

@@ -55,9 +55,7 @@ class StreamURLRequestJobTest : public testing::Test {
     StreamRegistry* registry_;
   };
 
-  StreamURLRequestJobTest()
-      : task_environment_(
-            base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+  StreamURLRequestJobTest() {}
 
   void SetUp() override {
     registry_.reset(new StreamRegistry());
@@ -109,7 +107,8 @@ class StreamURLRequestJobTest : public testing::Test {
   }
 
  protected:
-  base::test::ScopedTaskEnvironment task_environment_;
+  base::test::ScopedTaskEnvironment task_environment_{
+      base::test::ScopedTaskEnvironment::MainThreadType::IO};
   std::unique_ptr<StreamRegistry> registry_;
 
   net::URLRequestContext url_request_context_;

content/browser/tracing/background_tracing_config_unittest.cc

@@ -7,6 +7,7 @@
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/test/scoped_task_environment.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "content/browser/tracing/background_tracing_config_impl.h"
 #include "content/browser/tracing/background_tracing_rule.h"
@@ -18,8 +19,7 @@ namespace content {
 class BackgroundTracingConfigTest : public testing::Test {
  public:
   BackgroundTracingConfigTest()
-      : ui_thread_(BrowserThread::UI,
-                   task_environment_.GetMainThreadTaskRunner()) {}
+      : ui_thread_(BrowserThread::UI, base::ThreadTaskRunnerHandle::Get()) {}
 
  protected:
   base::test::ScopedTaskEnvironment task_environment_;

content/renderer/loader/shared_memory_data_consumer_handle_unittest.cc

@@ -134,7 +134,7 @@ class ThreadedSharedMemoryDataConsumerHandleTest : public ::testing::Test {
         scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
         const base::Closure& on_done)
         : handle_(std::move(handle)),
-          main_thread_task_runner_(main_thread_task_runner),
+          main_thread_task_runner_(std::move(main_thread_task_runner)),
           on_done_(on_done) {}
 
     const std::string& result() const { return result_; }
@@ -1044,7 +1044,8 @@ TEST(SharedMemoryDataConsumerHandleWithoutBackpressureTest, AddData) {
 TEST_F(ThreadedSharedMemoryDataConsumerHandleTest, Read) {
   base::RunLoop run_loop;
   auto operation = std::make_unique<ReadDataOperation>(
-      std::move(handle_), base::ThreadTaskRunnerHandle::Get(),
+      std::move(handle_),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
       run_loop.QuitClosure());
   scoped_refptr<Logger> logger(new Logger);
 

content/renderer/loader/url_response_body_consumer_unittest.cc

@@ -154,8 +154,8 @@ class URLResponseBodyConsumerTest : public ::testing::Test {
         blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
         TRAFFIC_ANNOTATION_FOR_TESTS, false,
         false /* pass_response_pipe_to_peer */,
-        std::make_unique<TestRequestPeer>(context,
-                                          base::ThreadTaskRunnerHandle::Get()),
+        std::make_unique<TestRequestPeer>(
+            context, blink::scheduler::GetSingleThreadTaskRunnerForTesting()),
         base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
             &factory_),
         std::vector<std::unique_ptr<URLLoaderThrottle>>(),
@@ -183,7 +183,7 @@ TEST_F(URLResponseBodyConsumerTest, ReceiveData) {
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
-      base::ThreadTaskRunnerHandle::Get()));
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting()));
   consumer->ArmOrNotify();
 
   mojo::ScopedDataPipeProducerHandle writer =
@@ -208,7 +208,7 @@ TEST_F(URLResponseBodyConsumerTest, OnCompleteThenClose) {
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
-      base::ThreadTaskRunnerHandle::Get()));
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting()));
   consumer->ArmOrNotify();
 
   consumer->OnComplete(network::URLLoaderCompletionStatus());
@@ -243,7 +243,7 @@ TEST_F(URLResponseBodyConsumerTest, OnCompleteThenCloseWithAsyncRelease) {
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
-      base::ThreadTaskRunnerHandle::Get()));
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting()));
   consumer->ArmOrNotify();
 
   consumer->OnComplete(network::URLLoaderCompletionStatus());
@@ -275,7 +275,7 @@ TEST_F(URLResponseBodyConsumerTest, CloseThenOnComplete) {
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
-      base::ThreadTaskRunnerHandle::Get()));
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting()));
   consumer->ArmOrNotify();
 
   network::URLLoaderCompletionStatus status;
@@ -318,7 +318,7 @@ TEST_F(URLResponseBodyConsumerTest, TooBigChunkShouldBeSplit) {
 
   scoped_refptr<URLResponseBodyConsumer> consumer(new URLResponseBodyConsumer(
       request_id, dispatcher_.get(), std::move(data_pipe.consumer_handle),
-      base::ThreadTaskRunnerHandle::Get()));
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting()));
   consumer->ArmOrNotify();
 
   Run(&context);

content/renderer/loader/web_data_consumer_handle_impl_unittest.cc

@@ -67,7 +67,7 @@ class ReadDataOperation : public ReadDataOperationBase {
       scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
       const base::Closure& on_done)
       : handle_(new WebDataConsumerHandleImpl(std::move(handle))),
-        main_thread_task_runner_(main_thread_task_runner),
+        main_thread_task_runner_(std::move(main_thread_task_runner)),
         on_done_(on_done) {}
 
   const std::string& result() const { return result_; }
@@ -128,7 +128,7 @@ class TwoPhaseReadDataOperation : public ReadDataOperationBase {
       scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
       const base::Closure& on_done)
       : handle_(new WebDataConsumerHandleImpl(std::move(handle))),
-        main_thread_task_runner_(main_thread_task_runner),
+        main_thread_task_runner_(std::move(main_thread_task_runner)),
         on_done_(on_done) {}
 
   const std::string& result() const { return result_; }
@@ -247,7 +247,8 @@ class WebDataConsumerHandleImplTest : public ::testing::Test {
 TEST_F(WebDataConsumerHandleImplTest, ReadData) {
   base::RunLoop run_loop;
   auto operation = std::make_unique<ReadDataOperation>(
-      std::move(consumer_), base::ThreadTaskRunnerHandle::Get(),
+      std::move(consumer_),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
       run_loop.QuitClosure());
 
   base::Thread t("DataConsumerHandle test thread");
@@ -269,7 +270,8 @@ TEST_F(WebDataConsumerHandleImplTest, ReadData) {
 TEST_F(WebDataConsumerHandleImplTest, TwoPhaseReadData) {
   base::RunLoop run_loop;
   auto operation = std::make_unique<TwoPhaseReadDataOperation>(
-      std::move(consumer_), base::ThreadTaskRunnerHandle::Get(),
+      std::move(consumer_),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
       run_loop.QuitClosure());
 
   base::Thread t("DataConsumerHandle test thread");

content/renderer/media/renderer_webaudiodevice_impl_unittest.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_task_environment.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/renderer/media/audio/audio_device_factory.h"
 #include "media/base/audio_capturer_source.h"
@@ -14,6 +15,7 @@
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 
 using testing::_;
 
@@ -69,7 +71,7 @@ class RendererWebAudioDeviceImplTest
     webaudio_device_.reset(new RendererWebAudioDeviceImplUnderTest(
         media::CHANNEL_LAYOUT_MONO, 1, latencyHint, this, 0));
     webaudio_device_->SetMediaTaskRunnerForTesting(
-        task_environment_.GetMainThreadTaskRunner());
+        blink::scheduler::GetSingleThreadTaskRunnerForTesting());
   }
 
   void SetupDevice(media::ChannelLayout layout, int channels) {
@@ -79,7 +81,7 @@ class RendererWebAudioDeviceImplTest
             blink::WebAudioLatencyHint::kCategoryInteractive),
         this, 0));
     webaudio_device_->SetMediaTaskRunnerForTesting(
-        task_environment_.GetMainThreadTaskRunner());
+        blink::scheduler::GetSingleThreadTaskRunnerForTesting());
   }
 
   MOCK_METHOD2(CreateAudioCapturerSource,

content/renderer/media/stream/webmediaplayer_ms_unittest.cc

@@ -22,6 +22,7 @@
 #include "media/video/mock_gpu_memory_buffer_video_frame_pool.h"
 #include "media/video/mock_gpu_video_accelerator_factories.h"
 #include "third_party/blink/public/common/picture_in_picture/picture_in_picture_control_info.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_fullscreen_video_status.h"
 #include "third_party/blink/public/platform/web_media_player.h"
 #include "third_party/blink/public/platform/web_media_player_client.h"
@@ -525,9 +526,9 @@ class WebMediaPlayerMSTest
       public cc::VideoFrameProvider::Client {
  public:
   WebMediaPlayerMSTest()
-      : render_factory_(
-            new MockRenderFactory(base::ThreadTaskRunnerHandle::Get(),
-                                  &message_loop_controller_)),
+      : render_factory_(new MockRenderFactory(
+            blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
+            &message_loop_controller_)),
         gpu_factories_(new media::MockGpuVideoAcceleratorFactories(nullptr)),
         surface_layer_bridge_(
             std::make_unique<NiceMock<MockSurfaceLayerBridge>>()),
@@ -684,8 +685,10 @@ void WebMediaPlayerMSTest::InitializeWebMediaPlayerMS() {
   player_ = std::make_unique<WebMediaPlayerMS>(
       nullptr, this, &delegate_, std::make_unique<media::MediaLog>(),
       std::unique_ptr<MediaStreamRendererFactory>(render_factory_),
-      base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
-      base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(),
       gpu_factories_.get(), blink::WebString(),
       base::BindOnce(&WebMediaPlayerMSTest::CreateMockSurfaceLayerBridge,
                      base::Unretained(this)),
@@ -764,7 +767,7 @@ void WebMediaPlayerMSTest::StopUsingProvider() {
 void WebMediaPlayerMSTest::StartRendering() {
   if (!rendering_) {
     rendering_ = true;
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    blink::scheduler::GetSingleThreadTaskRunnerForTesting()->PostTask(
         FROM_HERE, base::BindOnce(&WebMediaPlayerMSTest::RenderFrame,
                                   base::Unretained(this)));
   }
@@ -799,7 +802,7 @@ void WebMediaPlayerMSTest::RenderFrame() {
     auto frame = compositor_->GetCurrentFrame();
     compositor_->PutCurrentFrame();
   }
-  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+  blink::scheduler::GetSingleThreadTaskRunnerForTesting()->PostDelayedTask(
       FROM_HERE,
       base::BindOnce(&WebMediaPlayerMSTest::RenderFrame,
                      base::Unretained(this)),

content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc

@@ -20,6 +20,7 @@
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_media_stream.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/public/platform/web_string.h"
@@ -66,10 +67,7 @@ class WebRtcAudioRendererTest : public testing::Test,
   }
 
  protected:
-  WebRtcAudioRendererTest()
-      : task_environment_(
-            base::test::ScopedTaskEnvironment::MainThreadType::IO),
-        source_(new MockAudioRendererSource()) {
+  WebRtcAudioRendererTest() : source_(new MockAudioRendererSource()) {
     blink::WebVector<blink::WebMediaStreamTrack> dummy_tracks;
     stream_.Initialize(blink::WebString::FromUTF8("new stream"), dummy_tracks,
                        dummy_tracks);
@@ -78,8 +76,9 @@ class WebRtcAudioRendererTest : public testing::Test,
   }
 
   void SetupRenderer(const std::string& device_id) {
-    renderer_ = new WebRtcAudioRenderer(base::ThreadTaskRunnerHandle::Get(),
-                                        stream_, 1, 1, device_id);
+    renderer_ = new WebRtcAudioRenderer(
+        blink::scheduler::GetSingleThreadTaskRunnerForTesting(), stream_, 1, 1,
+        device_id);
     EXPECT_CALL(
         *this, MockCreateAudioRendererSink(AudioDeviceFactory::kSourceWebRtc, _,
                                            _, device_id, _));
@@ -144,7 +143,8 @@ class WebRtcAudioRendererTest : public testing::Test,
 
   const base::Optional<base::UnguessableToken> kAudioProcessingId =
       base::UnguessableToken::Create();
-  base::test::ScopedTaskEnvironment task_environment_;
+  base::test::ScopedTaskEnvironment task_environment_{
+      base::test::ScopedTaskEnvironment::MainThreadType::IO};
   scoped_refptr<media::MockAudioRendererSink> mock_sink_;
   std::unique_ptr<MockAudioRendererSource> source_;
   blink::WebMediaStream stream_;
@@ -294,8 +294,9 @@ TEST_F(WebRtcAudioRendererTest, SwitchOutputDeviceInvalidDevice) {
 }
 
 TEST_F(WebRtcAudioRendererTest, InitializeWithInvalidDevice) {
-  renderer_ = new WebRtcAudioRenderer(base::ThreadTaskRunnerHandle::Get(),
-                                      stream_, 1, 1, kInvalidOutputDeviceId);
+  renderer_ = new WebRtcAudioRenderer(
+      blink::scheduler::GetSingleThreadTaskRunnerForTesting(), stream_, 1, 1,
+      kInvalidOutputDeviceId);
 
   EXPECT_CALL(*this, MockCreateAudioRendererSink(
                          AudioDeviceFactory::kSourceWebRtc, _, _,

content/renderer/media_capture_from_element/canvas_capture_handler_unittest.cc

@@ -7,11 +7,13 @@
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_task_environment.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/stream/media_stream_video_capturer_source.h"
 #include "media/base/limits.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_media_stream_source.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/public/platform/web_size.h"
@@ -56,7 +58,7 @@ class CanvasCaptureHandlerTest
     canvas_capture_handler_ = CanvasCaptureHandler::CreateCanvasCaptureHandler(
         blink::WebSize(kTestCanvasCaptureWidth, kTestCanvasCaptureHeight),
         kTestCanvasCaptureFramesPerSecond,
-        scoped_task_environment_.GetMainThreadTaskRunner(), &track_);
+        blink::scheduler::GetSingleThreadTaskRunnerForTesting(), &track_);
   }
 
   void TearDown() override {

content/renderer/media_recorder/video_track_recorder_unittest.cc

@@ -84,7 +84,7 @@ class VideoTrackRecorderTest
     // Paranoia checks.
     EXPECT_EQ(blink_track_.Source().GetExtraData(),
               blink_source_.GetExtraData());
-    EXPECT_TRUE(scoped_task_environment_.GetMainThreadTaskRunner()
+    EXPECT_TRUE(blink::scheduler::GetSingleThreadTaskRunnerForTesting()
                     ->BelongsToCurrentThread());
   }
 
@@ -125,7 +125,7 @@ class VideoTrackRecorderTest
 
   void Encode(const scoped_refptr<VideoFrame>& frame,
               base::TimeTicks capture_time) {
-    EXPECT_TRUE(scoped_task_environment_.GetMainThreadTaskRunner()
+    EXPECT_TRUE(blink::scheduler::GetSingleThreadTaskRunnerForTesting()
                     ->BelongsToCurrentThread());
     video_track_recorder_->OnVideoFrameForTesting(frame, capture_time);
   }