Crash fix for window closed during Aura window capture.

content/browser/media/capture/aura_window_capture_machine.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/browser/media/capture/aura_window_capture_machine.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 438 matching lines @@
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   DCHECK(desktop_window_ && window == desktop_window_);
 
   // Post task to update capture size on UI thread.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &AuraWindowCaptureMachine::UpdateCaptureSize, AsWeakPtr()));
 }
 
-void AuraWindowCaptureMachine::OnWindowDestroyed(aura::Window* window) {
+void AuraWindowCaptureMachine::OnWindowDestroying(aura::Window* window) {

[miu, 2015/09/03 20:46:44]

Note: I changed this from OnWindowDestroyed() to OnWindowDestroying() so that we
stop at the very beginning of the aura::Window destructor.  This may or may not
make a difference, but is safer because InternalStop() is making calls on the
Window's associated WindowTreeHost.

   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  Stop(base::Bind(&base::DoNothing));
+  InternalStop(base::Bind(&base::DoNothing));
 
-  oracle_proxy_->ReportError("OnWindowDestroyed()");
+  oracle_proxy_->ReportError("OnWindowDestroying()");
 }
 
 void AuraWindowCaptureMachine::OnWindowAddedToRootWindow(
     aura::Window* window) {
   DCHECK(window == desktop_window_);
   window->GetHost()->compositor()->AddObserver(this);
 }
 
 void AuraWindowCaptureMachine::OnWindowRemovingFromRootWindow(
     aura::Window* window,
     aura::Window* new_root) {
   DCHECK(window == desktop_window_);
   window->GetHost()->compositor()->RemoveObserver(this);
 }
 
 void AuraWindowCaptureMachine::OnCompositingEnded(
     ui::Compositor* compositor) {
   // TODO(miu): The CopyOutputRequest should be made earlier, at WillCommit().
   // http://crbug.com/492839
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &AuraWindowCaptureMachine::Capture, AsWeakPtr(), true));
 }
 
 }  // namespace content