Upstream version 10.39.225.0

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

diff --git a/src/media/cast/cast_environment.h b/src/media/cast/cast_environment.h
index e9d1eb4..d3c9474 100644 (file)
--- a/src/media/cast/cast_environment.h
+++ b/src/media/cast/cast_environment.h
@@ -64,13 +64,9 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
   scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner(
       ThreadId identifier) const;
 
-  bool HasAudioThread() {
-    return audio_thread_proxy_ ? true : false;
-  }
+  bool HasAudioThread() { return audio_thread_proxy_.get() ? true : false; }
 
-  bool HasVideoThread() {
-    return video_thread_proxy_ ? true : false;
-  }
+  bool HasVideoThread() { return video_thread_proxy_.get() ? true : false; }
 
  protected:
   virtual ~CastEnvironment();
@@ -79,13 +75,12 @@ class CastEnvironment : public base::RefCountedThreadSafe<CastEnvironment> {
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_proxy_;
   scoped_refptr<base::SingleThreadTaskRunner> audio_thread_proxy_;
   scoped_refptr<base::SingleThreadTaskRunner> video_thread_proxy_;
+  scoped_ptr<base::TickClock> clock_;
+  scoped_ptr<LoggingImpl> logging_;
 
  private:
   friend class base::RefCountedThreadSafe<CastEnvironment>;
 
-  scoped_ptr<base::TickClock> clock_;
-  scoped_ptr<LoggingImpl> logging_;
-
   DISALLOW_COPY_AND_ASSIGN(CastEnvironment);
 };