Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21

1 files changed, 30 insertions, 17 deletions

diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h
index 8a135733c0..5abb5c7376 100644
--- a/media/cast/cast_environment.h
+++ b/media/cast/cast_environment.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/logging/logging_defines.h"
@@ -34,15 +34,19 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
     VIDEO_ENCODER,
     // The video decoder thread is where the video decode processing is done.
     VIDEO_DECODER,
+    // The transport thread is where the transport processing is done.
+    TRANSPORT,
   };
 
-  CastEnvironment(base::TickClock* clock,
-                  scoped_refptr<base::TaskRunner> main_thread_proxy,
-                  scoped_refptr<base::TaskRunner> audio_encode_thread_proxy,
-                  scoped_refptr<base::TaskRunner> audio_decode_thread_proxy,
-                  scoped_refptr<base::TaskRunner> video_encode_thread_proxy,
-                  scoped_refptr<base::TaskRunner> video_decode_thread_proxy,
-                  const CastLoggingConfig& config);
+  CastEnvironment(
+      scoped_ptr<base::TickClock> clock,
+      scoped_refptr<base::SingleThreadTaskRunner> main_thread_proxy,
+      scoped_refptr<base::SingleThreadTaskRunner> audio_encode_thread_proxy,
+      scoped_refptr<base::SingleThreadTaskRunner> audio_decode_thread_proxy,
+      scoped_refptr<base::SingleThreadTaskRunner> video_encode_thread_proxy,
+      scoped_refptr<base::SingleThreadTaskRunner> video_decode_thread_proxy,
+      scoped_refptr<base::SingleThreadTaskRunner> transport_thread_proxy,
+      const CastLoggingConfig& config);
 
   // These are the same methods in message_loop.h, but are guaranteed to either
   // get posted to the MessageLoop if it's still alive, or be deleted otherwise.
@@ -65,21 +69,30 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
   // Logging is not thread safe. Should always be called from the main thread.
   LoggingImpl* Logging();
 
+  scoped_refptr<base::SingleThreadTaskRunner>
+      GetMessageSingleThreadTaskRunnerForThread(ThreadId identifier);
+
+  bool HasAudioEncoderThread() {
+    return audio_encode_thread_proxy_ ? true : false;
+  }
+
+  bool HasVideoEncoderThread() {
+    return video_encode_thread_proxy_ ? true : false;
+  }
+
  protected:
   virtual ~CastEnvironment();
 
  private:
   friend class base::RefCountedThreadSafe<CastEnvironment>;
 
-  scoped_refptr<base::TaskRunner> GetMessageTaskRunnerForThread(
-      ThreadId identifier);
-
-  base::TickClock* const clock_;  // Not owned by this class.
-  scoped_refptr<base::TaskRunner> main_thread_proxy_;
-  scoped_refptr<base::TaskRunner> audio_encode_thread_proxy_;
-  scoped_refptr<base::TaskRunner> audio_decode_thread_proxy_;
-  scoped_refptr<base::TaskRunner> video_encode_thread_proxy_;
-  scoped_refptr<base::TaskRunner> video_decode_thread_proxy_;
+  scoped_ptr<base::TickClock> clock_;
+  scoped_refptr<base::SingleThreadTaskRunner> main_thread_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> audio_encode_thread_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> audio_decode_thread_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> video_encode_thread_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> video_decode_thread_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> transport_thread_proxy_;
 
   scoped_ptr<LoggingImpl> logging_;