Non-const impls. for WebMediaPlayer::didLoadingProgress().

This provides non-const didLoadingProgress() implementations for WebMediaPlayer subclasses in Chromium so that the interface can switch to being non-const. It also removes the const specifier from DidLoadingProgress() implementations (Pipeline and DemuxerHost) and the mutable specifier for their associated properties.

This is the first of three changes; the second is
https://codereview.chromium.org/272223004.

BUG=360251

Review URL: https://codereview.chromium.org/275303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269910 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/media/android/webmediaplayer_android.cc

@@ -449,6 +449,10 @@ double WebMediaPlayerAndroid::maxTimeSeekable() const {
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() const {
+  return const_cast<WebMediaPlayerAndroid*>(this)->didLoadingProgress();
+}
+
+bool WebMediaPlayerAndroid::didLoadingProgress() {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;

content/renderer/media/android/webmediaplayer_android.h

@@ -132,7 +132,10 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   virtual double timelineOffset() const;
   virtual double currentTime() const;
 
+  // TODO(sandersd): Remove const version.
+  // http://crbug.com/360251
   virtual bool didLoadingProgress() const;
+  virtual bool didLoadingProgress();
 
   // Internal states of loading and network.
   virtual blink::WebMediaPlayer::NetworkState networkState() const;
@@ -331,7 +334,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   base::TimeDelta seek_time_;
 
   // Whether loading has progressed since the last call to didLoadingProgress.
-  mutable bool did_loading_progress_;
+  bool did_loading_progress_;
 
   // Manager for managing this object and for delegating method calls on
   // Render Thread.

content/renderer/media/buffered_data_source_host_impl.cc

@@ -47,7 +47,7 @@ void BufferedDataSourceHostImpl::AddBufferedTimeRanges(
   }
 }
 
-bool BufferedDataSourceHostImpl::DidLoadingProgress() const {
+bool BufferedDataSourceHostImpl::DidLoadingProgress() {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;

content/renderer/media/buffered_data_source_host_impl.h

@@ -29,9 +29,7 @@ class CONTENT_EXPORT BufferedDataSourceHostImpl
       media::Ranges<base::TimeDelta>* buffered_time_ranges,
       base::TimeDelta media_duration);
 
-  // TODO(sandersd): Change this to non-const along with Pipeline's version.
-  // http://crbug.com/360251
-  bool DidLoadingProgress() const;
+  bool DidLoadingProgress();
 
  private:
   // Total size of the data source.
@@ -42,7 +40,7 @@ class CONTENT_EXPORT BufferedDataSourceHostImpl
 
   // True when AddBufferedByteRange() has been called more recently than
   // DidLoadingProgress().
-  mutable bool did_loading_progress_;
+  bool did_loading_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSourceHostImpl);
 };

content/renderer/media/webmediaplayer_impl.cc

@@ -538,6 +538,10 @@ double WebMediaPlayerImpl::maxTimeSeekable() const {
 }
 
 bool WebMediaPlayerImpl::didLoadingProgress() const {
+  return const_cast<WebMediaPlayerImpl*>(this)->didLoadingProgress();
+}
+
+bool WebMediaPlayerImpl::didLoadingProgress() {
   DCHECK(main_loop_->BelongsToCurrentThread());
   bool pipeline_progress = pipeline_.DidLoadingProgress();
   bool data_progress = buffered_data_source_host_.DidLoadingProgress();

content/renderer/media/webmediaplayer_impl.h

@@ -115,9 +115,10 @@ class WebMediaPlayerImpl
   virtual blink::WebMediaPlayer::NetworkState networkState() const;
   virtual blink::WebMediaPlayer::ReadyState readyState() const;
 
-  // TODO(sandersd): Change this to non-const in blink::WebMediaPlayer.
+  // TODO(sandersd): Remove const version.
   // http://crbug.com/360251
   virtual bool didLoadingProgress() const;
+  virtual bool didLoadingProgress();
 
   virtual bool hasSingleSecurityOrigin() const;
   virtual bool didPassCORSAccessCheck() const;

content/renderer/media/webmediaplayer_ms.cc

@@ -316,6 +316,11 @@ bool WebMediaPlayerMS::didLoadingProgress() const {
   return true;
 }
 
+bool WebMediaPlayerMS::didLoadingProgress() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return true;
+}
+
 void WebMediaPlayerMS::paint(WebCanvas* canvas,
                              const WebRect& rect,
                              unsigned char alpha) {

content/renderer/media/webmediaplayer_ms.h

@@ -100,7 +100,10 @@ class WebMediaPlayerMS
   virtual blink::WebMediaPlayer::NetworkState networkState() const;
   virtual blink::WebMediaPlayer::ReadyState readyState() const;
 
+  // TODO(sandersd): Remove const version.
+  // http://crbug.com/360251
   virtual bool didLoadingProgress() const;
+  virtual bool didLoadingProgress();
 
   virtual bool hasSingleSecurityOrigin() const;
   virtual bool didPassCORSAccessCheck() const;

media/base/pipeline.cc

@@ -169,7 +169,7 @@ TimeDelta Pipeline::GetMediaDuration() const {
   return clock_->Duration();
 }
 
-bool Pipeline::DidLoadingProgress() const {
+bool Pipeline::DidLoadingProgress() {
   base::AutoLock auto_lock(lock_);
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;

media/base/pipeline.h

@@ -172,7 +172,7 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
 
   // Return true if loading progress has been made since the last time this
   // method was called.
-  bool DidLoadingProgress() const;
+  bool DidLoadingProgress();
 
   // Gets the current pipeline statistics.
   PipelineStatistics GetStatistics() const;
@@ -345,7 +345,7 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost {
 
   // True when AddBufferedTimeRange() has been called more recently than
   // DidLoadingProgress().
-  mutable bool did_loading_progress_;
+  bool did_loading_progress_;
 
   // Current volume level (from 0.0f to 1.0f).  This value is set immediately
   // via SetVolume() and a task is dispatched on the task runner to notify the