Clear m_webMediaPlayer at one place in HTMLMediaElement

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 3459 matching lines @@
 }
 
 void* HTMLMediaElement::preDispatchEventHandler(Event* event)
 {
     if (event && event->type() == EventTypeNames::webkitfullscreenchange)
         configureMediaControls();
 
     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.
     m_remoteRoutesAvailable = false;
     m_playingRemotely = false;
 
 #if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode)
         audioSourceProvider().setClient(m_audioSourceNode);
 #endif
@@ skipping 279 matching lines @@
     visitor->trace(m_client);
 }
 
 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
 {
     visitor->trace(m_client);
 }
 #endif
 
 }