WeakPtr destruction order cleanup: media edition.

content/renderer/media/webaudiosourceprovider_impl.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/webaudiosourceprovider_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 30 matching lines @@
  private:
   base::Lock& lock_;
   const bool acquired_;
   DISALLOW_COPY_AND_ASSIGN(AutoTryLock);
 };
 
 }  // namespace
 
 WebAudioSourceProviderImpl::WebAudioSourceProviderImpl(
     const scoped_refptr<media::AudioRendererSink>& sink)
-    : weak_this_(this),
-      channels_(0),
+    : channels_(0),
       sample_rate_(0),
       volume_(1.0),
       state_(kStopped),
       renderer_(NULL),
       client_(NULL),
-      sink_(sink) {
-}
+      sink_(sink),
+      weak_factory_(this) {}
 
 WebAudioSourceProviderImpl::~WebAudioSourceProviderImpl() {
 }
 
 void WebAudioSourceProviderImpl::setClient(
     blink::WebAudioSourceProviderClient* client) {
   base::AutoLock auto_lock(sink_lock_);
   if (client && client != client_) {
     // Detach the audio renderer from normal playback.
     sink_->Stop();
 
     // The client will now take control by calling provideInput() periodically.
     client_ = client;
 
-    set_format_cb_ = media::BindToCurrentLoop(
-        base::Bind(&WebAudioSourceProviderImpl::OnSetFormat,
-                   weak_this_.GetWeakPtr()));
+    set_format_cb_ = media::BindToCurrentLoop(base::Bind(
+        &WebAudioSourceProviderImpl::OnSetFormat, weak_factory_.GetWeakPtr()));
 
     // If |renderer_| is set, then run |set_format_cb_| to send |client_|
     // the current format info. If |renderer_| is not set, then |set_format_cb_|
     // will get called when Initialize() is called.
     // Note: Always using |set_format_cb_| ensures we have the same
     // locking order when calling into |client_|.
     if (renderer_)
       base::ResetAndReturn(&set_format_cb_).Run();
   } else if (!client && client_) {
     // Restore normal playback.
@@ skipping 93 matching lines @@
 void WebAudioSourceProviderImpl::OnSetFormat() {
   base::AutoLock auto_lock(sink_lock_);
   if (!client_)
     return;
 
   // Inform Blink about the audio stream format.
   client_->setFormat(channels_, sample_rate_);
 }
 
 }  // namespace content