Clear m_webMediaPlayer at one place in HTMLMediaElement

Currently m_webMediaPlayer is cleared in resetMediaPlayerAndMediaSource
and clearMediaPlayerAndAudioSourceProviderClientWithoutLocking. So
reusing clearMediaPlayerAndAudioSourceProviderClientWithoutLocking
in resetMediaPlayerAndMediaSource.

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

git-svn-id: svn://svn.chromium.org/blink/trunk@200720 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

@@ -3472,19 +3472,14 @@ void* HTMLMediaElement::preDispatchEventHandler(Event* event)
     return nullptr;
 }
 
-// TODO(srirama.m): Refactor this and other relevant methods and have a
-// single method for clearing the mediaplayer and its stuff.
+// TODO(srirama.m): Refactor this and clearMediaPlayer to the extent possible.
 void HTMLMediaElement::resetMediaPlayerAndMediaSource()
 {
-    AudioSourceProviderClientLockScope scope(*this);
-
     closeMediaSource();
 
-    if (m_webMediaPlayer) {
-#if ENABLE(WEB_AUDIO)
-        m_audioSourceProvider.wrap(nullptr);
-#endif
-        m_webMediaPlayer.clear();
+    {
+        AudioSourceProviderClientLockScope scope(*this);
+        clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();
     }
 
     // We haven't yet found out if any remote routes are available.