Remove what remains of MediaControllerInterface

Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 145 matching lines @@
         return false;
 
     m_enclosure = enclosure.get();
     appendChild(enclosure.release(), exceptionState);
     if (exceptionState.hadException())
         return false;
 
     return true;
 }
 
-MediaControllerInterface& MediaControls::mediaControllerInterface() const
-{
-    if (m_mediaElement.controller())
-        return *m_mediaElement.controller();
-    return m_mediaElement;
-}
-
 void MediaControls::reset()
 {
-    double duration = mediaControllerInterface().duration();
+    double duration = mediaElement().duration();
     m_durationDisplay->setInnerText(RenderTheme::theme().formatMediaControlsTime(duration), ASSERT_NO_EXCEPTION);
     m_durationDisplay->setCurrentValue(duration);
 
     updatePlayState();
 
     updateCurrentTimeDisplay();
 
-    m_timeline->setDuration(mediaControllerInterface().duration());
-    m_timeline->setPosition(mediaControllerInterface().currentTime());
+    m_timeline->setDuration(duration);
+    m_timeline->setPosition(mediaElement().currentTime());
 
     if (!mediaElement().hasAudio())
         m_volumeSlider->hide();
     else
         m_volumeSlider->show();
     updateVolume();
 
     refreshClosedCaptionsButtonVisibility();
 
     if (mediaElement().hasVideo())
@@ skipping 31 matching lines @@
 {
     return alwaysHideFullscreenControls || !m_panel->hovered();
 }
 
 void MediaControls::playbackStarted()
 {
     m_currentTimeDisplay->show();
     m_durationDisplay->hide();
 
     updatePlayState();
-    m_timeline->setPosition(mediaControllerInterface().currentTime());
+    m_timeline->setPosition(mediaElement().currentTime());
     updateCurrentTimeDisplay();
 
     if (m_isFullscreen)
         startHideFullscreenControlsTimer();
 }
 
 void MediaControls::playbackProgressed()
 {
-    m_timeline->setPosition(mediaControllerInterface().currentTime());
+    m_timeline->setPosition(mediaElement().currentTime());
     updateCurrentTimeDisplay();
 
     if (!m_isMouseOverControls && mediaElement().hasVideo())
         makeTransparent();
 }
 
 void MediaControls::playbackStopped()
 {
     updatePlayState();
-    m_timeline->setPosition(mediaControllerInterface().currentTime());
+    m_timeline->setPosition(mediaElement().currentTime());
     updateCurrentTimeDisplay();
     makeOpaque();
 
     stopHideFullscreenControlsTimer();
 }
 
 void MediaControls::updatePlayState()
 {
     if (m_isPausedForScrubbing)
         return;
@@ skipping 15 matching lines @@
 {
     if (m_isPausedForScrubbing) {
         m_isPausedForScrubbing = false;
         if (mediaElement().togglePlayStateWillPlay())
             mediaElement().togglePlayState();
     }
 }
 
 void MediaControls::updateCurrentTimeDisplay()
 {
-    double now = mediaControllerInterface().currentTime();
-    double duration = mediaControllerInterface().duration();
+    double now = mediaElement().currentTime();
+    double duration = mediaElement().duration();
 
     // After seek, hide duration display and show current time.
     if (now > 0) {
         m_currentTimeDisplay->show();
         m_durationDisplay->hide();
     }
 
     // Allow the theme to format the time.
     m_currentTimeDisplay->setInnerText(RenderTheme::theme().formatMediaControlsCurrentTime(now, duration), IGNORE_EXCEPTION);
     m_currentTimeDisplay->setCurrentValue(now);
@@ skipping 153 matching lines @@
 
 void MediaControls::updateTextTrackDisplay()
 {
     if (!m_textDisplayContainer)
         createTextTrackDisplay();
 
     m_textDisplayContainer->updateDisplay();
 }
 
 }