Move Demuxer::set_host() to Initialize().

media/base/pipeline.cc

 // Copyright (c) 2012 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 "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 1073 matching lines @@
 void Pipeline::InitializeDemuxer() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(IsPipelineOk());
 
   demuxer_ = filter_collection_->GetDemuxer();
   if (!demuxer_) {
     SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
     return;
   }
 
-  demuxer_->set_host(this);
-  demuxer_->Initialize(base::Bind(&Pipeline::OnDemuxerInitialized, this));
+  demuxer_->Initialize(this, base::Bind(&Pipeline::OnDemuxerInitialized, this));
 }
 
 void Pipeline::OnDemuxerInitialized(PipelineStatus status) {
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &Pipeline::OnDemuxerInitialized, this, status));
     return;
   }
 
   if (status != PIPELINE_OK) {
@@ skipping 265 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media