Extend VideoCaptureDevice::Client::OnError() to have a tracked_objects::Location param.

media/capture/content/thread_safe_capture_oracle.h

 // 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.
 
 #ifndef MEDIA_CAPTURE_THREAD_SAFE_CAPTURE_ORACLE_H_
 #define MEDIA_CAPTURE_THREAD_SAFE_CAPTURE_ORACLE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/video_frame.h"
 #include "media/capture/content/video_capture_oracle.h"
 #include "media/capture/video/video_capture_device.h"
 
+namespace tracked_objects {
+class Location;
+}  // namespace tracked_objects
+
 namespace media {
 
 struct VideoCaptureParams;
 class VideoFrame;
 
 // Thread-safe, refcounted proxy to the VideoCaptureOracle.  This proxy wraps
 // the VideoCaptureOracle, which decides which frames to capture, and a
 // VideoCaptureDevice::Client, which allocates and receives the captured
 // frames, in a lock to synchronize state between the two.
 class MEDIA_EXPORT ThreadSafeCaptureOracle
@@ skipping 29 matching lines @@
   gfx::Size GetCaptureSize() const;
 
   // Updates capture resolution based on the supplied source size and the
   // maximum frame size.
   void UpdateCaptureSize(const gfx::Size& source_size);
 
   // Stop new captures from happening (but doesn't forget the client).
   void Stop();
 
   // Signal an error to the client.
-  void ReportError(const std::string& reason);
+  void ReportError(const tracked_objects::Location& from_here,
+                   const std::string& reason);
 
  private:
   friend class base::RefCountedThreadSafe<ThreadSafeCaptureOracle>;
   virtual ~ThreadSafeCaptureOracle();
 
   // Callback invoked on completion of all captures.
   void DidCaptureFrame(int frame_number,
                        scoped_ptr<VideoCaptureDevice::Client::Buffer> buffer,
                        base::TimeTicks capture_begin_time,
                        base::TimeDelta estimated_frame_duration,
@@ skipping 15 matching lines @@
   // Makes the decision to capture a frame.
   VideoCaptureOracle oracle_;
 
   // The video capture parameters used to construct the oracle proxy.
   const VideoCaptureParams params_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_THREAD_SAFE_CAPTURE_ORACLE_H_