Fix nits leftover from WMPA MSE deletion.

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 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 "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 126 matching lines @@
     int frame_id,
     bool enable_texture_copy,
     const media::WebMediaPlayerParams& params)
     : frame_(frame),
       client_(client),
       delegate_(delegate),
       delegate_id_(0),
       defer_load_cb_(params.defer_load_cb()),
       buffered_(static_cast<size_t>(1)),
       media_task_runner_(params.media_task_runner()),
-      ignore_metadata_duration_change_(false),
       pending_seek_(false),
       seeking_(false),
       did_loading_progress_(false),
       player_manager_(player_manager),
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       texture_id_(0),
       stream_id_(0),
       is_player_initialized_(false),
       is_playing_(false),
@@ skipping 524 matching lines @@
   if (is_local_resource_)
     UpdateNetworkState(WebMediaPlayer::NetworkStateLoaded);
 
   // For HLS streams, the reported duration may be zero for infinite streams.
   // See http://crbug.com/501213.
   if (duration.is_zero() && IsHLSStream())
     duration = media::kInfiniteDuration;
 
   // Update duration, if necessary, prior to ready state updates that may
   // cause duration() query.
-  if (!ignore_metadata_duration_change_ && duration_ != duration) {
+  if (duration_ != duration) {
     duration_ = duration;
     if (is_local_resource_)
       buffered_[0].end = duration_.InSecondsF();
     // Client readyState transition from HAVE_NOTHING to HAVE_METADATA
     // already triggers a durationchanged event. If this is a different
     // transition, remember to signal durationchanged.
     if (ready_state_ > WebMediaPlayer::ReadyStateHaveNothing)
       need_to_signal_duration_changed = true;
   }
 
@@ skipping 521 matching lines @@
     } else {
       // Even if OnPlaybackComplete() has not been called yet, Blink may have
       // already fired the ended event based on current time relative to
       // duration -- so we need to check both possibilities here.
       delegate_->DidPause(delegate_id_,
                           playback_completed_ || currentTime() >= duration());
     }
   }
 }
 
-void WebMediaPlayerAndroid::setContentDecryptionModule(
-    blink::WebContentDecryptionModule* cdm,
-    blink::WebContentDecryptionModuleResult result) {
-  DCHECK(main_thread_checker_.CalledOnValidThread());
-
-  result.completeWithError(
-      blink::WebContentDecryptionModuleExceptionInvalidStateError, 0,
-      "EME is not supported for this playback.");
-}
-
 void WebMediaPlayerAndroid::OnHidden() {
   // Pause audible video preserving its session.
   if (hasVideo() && IsBackgroundVideoCandidate() && !paused()) {
     Pause(false);
     is_play_pending_ = true;
     return;
   }
 
   OnSuspendRequested(false);
 }
@@ skipping 93 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableMediaSuspend)) {
     return false;
   }
 
   return base::FeatureList::IsEnabled(media::kResumeBackgroundVideo) &&
       hasAudio() && !isRemote() && delegate_ && delegate_->IsHidden();
 }
 
 }  // namespace content