X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchromecast%2Fmedia%2Fcma%2Ffilters%2Fdemuxer_stream_adapter.cc;h=db0d7b70ab25c9dcf514d545b0fd0d01d7dca4e8;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=2f27e78fe4e96bea0a2d887873f838b410065121;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chromecast/media/cma/filters/demuxer_stream_adapter.cc b/src/chromecast/media/cma/filters/demuxer_stream_adapter.cc
index 2f27e78..db0d7b7 100644
--- a/src/chromecast/media/cma/filters/demuxer_stream_adapter.cc
+++ b/src/chromecast/media/cma/filters/demuxer_stream_adapter.cc
@@ -30,7 +30,7 @@ class DummyMediaTaskRunner : public MediaTaskRunner {
   virtual bool PostMediaTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta timestamp) OVERRIDE;
+      base::TimeDelta timestamp) override;
 
  private:
   virtual ~DummyMediaTaskRunner();
@@ -68,8 +68,8 @@ DemuxerStreamAdapter::DemuxerStreamAdapter(
       demuxer_stream_(demuxer_stream),
       is_pending_read_(false),
       is_pending_demuxer_read_(false),
-      weak_factory_(this),
-      weak_this_(weak_factory_.GetWeakPtr()) {
+      weak_factory_(this) {
+  weak_this_ = weak_factory_.GetWeakPtr();
   ResetMediaTaskRunner();
   thread_checker_.DetachFromThread();
 }