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

media/capture/video/mac/video_capture_device_mac.h

 // Copyright (c) 2012 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.
 
 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or
 // AVFoundation as native capture API. QTKit is available in all OSX versions,
 // although namely deprecated in 10.9, and AVFoundation is available in versions
 // 10.7 (Lion) and later.
 
 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
 #define MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
 
 #import <Foundation/Foundation.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/video_capture_types.h"
 #include "media/capture/video/video_capture_device.h"
 
 @protocol PlatformVideoCapturingMac;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
+namespace tracked_objects {
+class Location;
+}  // namespace tracked_objects
+
 // Small class to bundle device name and connection type into a dictionary.
 MEDIA_EXPORT
 @interface DeviceNameAndTransportType : NSObject {
  @private
   base::scoped_nsobject<NSString> deviceName_;
   // The transport type of the device (USB, PCI, etc), values are defined in
   // <IOKit/audio/IOAudioTypes.h> as kIOAudioDeviceTransportType*.
   int32_t transportType_;
 }
 
@@ skipping 26 matching lines @@
   bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type);
 
   // Called to deliver captured video frames.
   void ReceiveFrame(const uint8* video_frame,
                     int video_frame_length,
                     const VideoCaptureFormat& frame_format,
                     int aspect_numerator,
                     int aspect_denominator);
 
   // Forwarder to VideoCaptureDevice::Client::OnError().
-  void ReceiveError(const std::string& reason);
+  void ReceiveError(const tracked_objects::Location& from_here,
+                    const std::string& reason);
 
   // Forwarder to VideoCaptureDevice::Client::OnLog().
   void LogMessage(const std::string& message);
 
  private:
-  void SetErrorState(const std::string& reason);
+  void SetErrorState(const tracked_objects::Location& from_here,
+                     const std::string& reason);
   bool UpdateCaptureResolution();
 
   // Flag indicating the internal state.
   enum InternalState { kNotInitialized, kIdle, kCapturing, kError };
 
   Name device_name_;
   scoped_ptr<VideoCaptureDevice::Client> client_;
 
   VideoCaptureFormat capture_format_;
   // These variables control the two-step configure-start process for QTKit HD:
@@ skipping 13 matching lines @@
   // VideoCaptureDeviceMac is destroyed.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_