Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / media / cast / cast_environment.cc

diff --git a/src/media/cast/cast_environment.cc b/src/media/cast/cast_environment.cc
index dddd0f7..9b1a569 100644 (file)
--- a/src/media/cast/cast_environment.cc
+++ b/src/media/cast/cast_environment.cc
@@ -8,7 +8,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 
-using base::TaskRunner;
+using base::SingleThreadTaskRunner;
 
 namespace {
 
@@ -23,12 +23,12 @@ namespace cast {
 
 CastEnvironment::CastEnvironment(
     scoped_ptr<base::TickClock> clock,
-    scoped_refptr<TaskRunner> main_thread_proxy,
-    scoped_refptr<TaskRunner> audio_encode_thread_proxy,
-    scoped_refptr<TaskRunner> audio_decode_thread_proxy,
-    scoped_refptr<TaskRunner> video_encode_thread_proxy,
-    scoped_refptr<TaskRunner> video_decode_thread_proxy,
-    scoped_refptr<TaskRunner> transport_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> main_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> audio_encode_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> audio_decode_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> video_encode_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> video_decode_thread_proxy,
+    scoped_refptr<SingleThreadTaskRunner> transport_thread_proxy,
     const CastLoggingConfig& config)
     : clock_(clock.Pass()),
       main_thread_proxy_(main_thread_proxy),
@@ -38,7 +38,7 @@ CastEnvironment::CastEnvironment(
       video_decode_thread_proxy_(video_decode_thread_proxy),
       transport_thread_proxy_(transport_thread_proxy),
       logging_(new LoggingImpl(main_thread_proxy, config)) {
-  DCHECK(main_thread_proxy) << "Main thread required";
+  DCHECK(main_thread_proxy);
 }
 
 CastEnvironment::~CastEnvironment() {
@@ -55,23 +55,25 @@ CastEnvironment::~CastEnvironment() {
 bool CastEnvironment::PostTask(ThreadId identifier,
                                const tracked_objects::Location& from_here,
                                const base::Closure& task) {
-  scoped_refptr<TaskRunner> task_runner =
-      GetMessageTaskRunnerForThread(identifier);
+  scoped_refptr<SingleThreadTaskRunner> task_runner =
+      GetMessageSingleThreadTaskRunnerForThread(identifier);
 
   return task_runner->PostTask(from_here, task);
 }
 
-bool CastEnvironment::PostDelayedTask(ThreadId identifier,
-                                 const tracked_objects::Location& from_here,
-                                 const base::Closure& task,
-                                 base::TimeDelta delay) {
-  scoped_refptr<TaskRunner> task_runner =
-      GetMessageTaskRunnerForThread(identifier);
+bool CastEnvironment::PostDelayedTask(
+    ThreadId identifier,
+    const tracked_objects::Location& from_here,
+    const base::Closure& task,
+    base::TimeDelta delay) {
+  scoped_refptr<SingleThreadTaskRunner> task_runner =
+      GetMessageSingleThreadTaskRunnerForThread(identifier);
 
   return task_runner->PostDelayedTask(from_here, task, delay);
 }
 
-scoped_refptr<TaskRunner> CastEnvironment::GetMessageTaskRunnerForThread(
+scoped_refptr<SingleThreadTaskRunner>
+CastEnvironment::GetMessageSingleThreadTaskRunnerForThread(
     ThreadId identifier) {
   switch (identifier) {
     case CastEnvironment::MAIN:
@@ -112,13 +114,11 @@ bool CastEnvironment::CurrentlyOn(ThreadId identifier) {
   }
 }
 
-base::TickClock* CastEnvironment::Clock() const {
-  return clock_.get();
-}
+base::TickClock* CastEnvironment::Clock() const { return clock_.get(); }
 
 LoggingImpl* CastEnvironment::Logging() {
-  DCHECK(CurrentlyOn(CastEnvironment::MAIN)) <<
-      "Must be called from main thread";
+  DCHECK(CurrentlyOn(CastEnvironment::MAIN))
+      << "Must be called from main thread";
   return logging_.get();
 }