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

media/base/demuxer.h

 // 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.
 
 #ifndef MEDIA_BASE_DEMUXER_H_
 #define MEDIA_BASE_DEMUXER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "media/base/data_source.h"
@@ skipping 16 matching lines @@
   virtual void SetBufferedTime(base::TimeDelta buffered_time) = 0;
 
   // Sets the byte offset at which the client is requesting the video.
   virtual void SetCurrentReadPosition(int64 offset) = 0;
 
   // Stops execution of the pipeline due to a fatal error.  Do not call this
   // method with PIPELINE_OK.
   virtual void OnDemuxerError(PipelineStatus error) = 0;
 };
 
-class MEDIA_EXPORT Demuxer
-    : public base::RefCountedThreadSafe<Demuxer> {
+class MEDIA_EXPORT Demuxer : public base::RefCountedThreadSafe<Demuxer> {
  public:
   Demuxer();
 
-  // Sets the private member |host_|. This is the first method called by
-  // the DemuxerHost after a demuxer is created.  The host holds a strong
-  // reference to the demuxer.  The reference held by the host is guaranteed
-  // to be released before the host object is destroyed by the pipeline.
-  virtual void set_host(DemuxerHost* host);
-
   // Completes initialization of the demuxer.
   //
-  // TODO(scherkus): pass in DemuxerHost here instead of using set_host(),
-  // see http://crbug.com/111585
-  virtual void Initialize(const PipelineStatusCB& status_cb) = 0;
+  // The demuxer does not own |host| as it is guaranteed to outlive the
+  // lifetime of the demuxer. Don't delete it!
+  virtual void Initialize(DemuxerHost* host,
+                          const PipelineStatusCB& status_cb) = 0;
 
   // The pipeline playback rate has been changed.  Demuxers may implement this
   // method if they need to respond to this call.
   virtual void SetPlaybackRate(float playback_rate);
 
   // Carry out any actions required to seek to the given time, executing the
   // callback upon completion.
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB& status_cb);
 
   // The pipeline is being stopped either as a result of an error or because
@@ skipping 20 matching lines @@
   // Returns true if the source is from a local file or stream (such as a
   // webcam stream), false otherwise.
   //
   // TODO(scherkus): See http://crbug.com/120426 on why we should remove this.
   virtual bool IsLocalSource() = 0;
 
   // Returns true if seeking is possible; false otherwise.
   virtual bool IsSeekable() = 0;
 
  protected:
-  // Only allow derived objects access to the DemuxerHost. This is
-  // kept out of the public interface because demuxers need to be
-  // aware of all calls made to the host object so they can insure
-  // the state presented to the host is always consistent with its own
-  // state.
-  DemuxerHost* host() { return host_; }
-
   friend class base::RefCountedThreadSafe<Demuxer>;
   virtual ~Demuxer();
 
  private:
-  DemuxerHost* host_;
-
   DISALLOW_COPY_AND_ASSIGN(Demuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_H_