Aura Window Capture: Ensure capture callback is always run.

media/capture/content/thread_safe_capture_oracle.cc

 // Copyright 2014 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 "media/capture/content/thread_safe_capture_oracle.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 123 matching lines @@
                            "frame_number", frame_number, "trigger",
                            VideoCaptureOracle::EventAsString(event));
 
   DCHECK_EQ(media::PIXEL_STORAGE_CPU, params_.requested_format.pixel_storage);
   *storage = VideoFrame::WrapExternalSharedMemory(
       params_.requested_format.pixel_format, coded_size,
       gfx::Rect(visible_size), visible_size,
       static_cast<uint8_t*>(output_buffer->data()),
       output_buffer->mapped_size(), base::SharedMemory::NULLHandle(), 0u,
       base::TimeDelta());
-  if (!(*storage))
+  // If creating the VideoFrame wrapper failed, call DidCaptureFrame() with
+  // !success to execute the required post-capture steps (tracing, notification
+  // of failure to VideoCaptureOracle, etc.).
+  if (!(*storage)) {
+    DidCaptureFrame(frame_number, std::move(output_buffer), capture_begin_time,
+                    estimated_frame_duration, *storage, event_time, false);
     return false;
+  }
+
   *callback = base::Bind(&ThreadSafeCaptureOracle::DidCaptureFrame, this,
                          frame_number, base::Passed(&output_buffer),
                          capture_begin_time, estimated_frame_duration);
 
   return true;
 }
 
 bool ThreadSafeCaptureOracle::AttemptPassiveRefresh() {
   const base::TimeTicks refresh_time = base::TimeTicks::Now();
 
@@ skipping 77 matching lines @@
   // destructor.  |metadata| is still valid for read-access at this point.
   double utilization = -1.0;
   if (metadata->GetDouble(media::VideoFrameMetadata::RESOURCE_UTILIZATION,
                           &utilization)) {
     base::AutoLock guard(lock_);
     oracle_.RecordConsumerFeedback(frame_number, utilization);
   }
 }
 
 }  // namespace media