[chromecast] Pass media task runner to VideoPlaneController.

chromecast/media/base/video_plane_controller.cc

 // Copyright 2015 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 "chromecast/media/base/video_plane_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
-#include "chromecast/media/base/media_message_loop.h"
 #include "chromecast/public/cast_media_shlib.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 
 bool RectFEqual(const RectF& r1, const RectF& r2) {
   return r1.x == r2.x && r1.y == r2.y && r1.width == r2.width &&
          r1.height == r2.height;
@@ skipping 105 matching lines @@
   // Min calling interval is computed as double average of last few time samples
   // (i.e. allow at least as much time between calls as the call itself takes).
   std::vector<int64_t> samples_;
   size_t sample_counter_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(RateLimitedSetVideoPlaneGeometry);
 };
 
-// static
-VideoPlaneController* VideoPlaneController::GetInstance() {
-  return base::Singleton<VideoPlaneController>::get();
-}
+VideoPlaneController::VideoPlaneController(
+    scoped_refptr<base::SingleThreadTaskRunner> media_task_runner)
+    : is_paused_(false),
+      have_output_res_(false),
+      have_graphics_res_(false),
+      output_res_(0, 0),
+      graphics_res_(0, 0),
+      have_video_plane_geometry_(false),
+      video_plane_display_rect_(0, 0),
+      video_plane_transform_(VideoPlane::TRANSFORM_NONE),
+      media_task_runner_(media_task_runner),
+      video_plane_wrapper_(
+          new RateLimitedSetVideoPlaneGeometry(media_task_runner_)) {}
+
+VideoPlaneController::~VideoPlaneController() {}
 
 // TODO(esum): SetGeometry, SetDeviceResolution, and SetGraphicsPlaneResolution
 // follow the same pattern (copy/paste). Currently it's not worth modularizing
 // since there are only 3 fields. If more fields are needed in the future,
 // consider making a generic method to implement this pattern.
 void VideoPlaneController::SetGeometry(const RectF& display_rect,
                                        VideoPlane::Transform transform) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(DisplayRectFValid(display_rect));
   if (have_video_plane_geometry_ &&
@@ skipping 60 matching lines @@
   VLOG(1) << "Resuming controller. VideoPlane SetGeometry calls are active.";
   is_paused_ = false;
   MaybeRunSetGeometry();
 }
 
 bool VideoPlaneController::is_paused() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return is_paused_;
 }
 
-VideoPlaneController::VideoPlaneController()
-    : is_paused_(false),
-      have_output_res_(false),
-      have_graphics_res_(false),
-      output_res_(0, 0),
-      graphics_res_(0, 0),
-      have_video_plane_geometry_(false),
-      video_plane_display_rect_(0, 0),
-      video_plane_transform_(VideoPlane::TRANSFORM_NONE),
-      media_task_runner_(MediaMessageLoop::GetTaskRunner()),
-      video_plane_wrapper_(
-          new RateLimitedSetVideoPlaneGeometry(media_task_runner_)) {}
-
-VideoPlaneController::~VideoPlaneController() {}
-
 void VideoPlaneController::MaybeRunSetGeometry() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (is_paused_) {
     VLOG(2) << "All VideoPlane SetGeometry calls are paused. Ignoring request.";
     return;
   }
 
   if (!HaveDataForSetGeometry()) {
     VLOG(2) << "Don't have all VideoPlane SetGeometry data. Ignoring request.";
     return;
@@ skipping 18 matching lines @@
                  video_plane_wrapper_, scaled_rect, video_plane_transform_));
 }
 
 bool VideoPlaneController::HaveDataForSetGeometry() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return have_output_res_ && have_graphics_res_ && have_video_plane_geometry_;
 }
 
 }  // namespace media
 }  // namespace chromecast