| Index: content/browser/media/capture/image_capture_impl.cc
|
| diff --git a/content/browser/media/capture/image_capture_impl.cc b/content/browser/media/capture/image_capture_impl.cc
|
| index b0c0db22af678ed4160edd9a6d2842ab1816041e..0a250f767ed1036d80036623870529ecf4d1fde0 100644
|
| --- a/content/browser/media/capture/image_capture_impl.cc
|
| +++ b/content/browser/media/capture/image_capture_impl.cc
|
| @@ -17,12 +17,6 @@ namespace content {
|
|
|
| namespace {
|
|
|
| -template<typename R, typename... Args>
|
| -void RunMojoCallback(const mojo::Callback<R(Args...)>& callback, Args... args) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - callback.Run(std::forward<Args>(args)...);
|
| -}
|
| -
|
| void RunFailedGetCapabilitiesCallback(
|
| const ImageCaptureImpl::GetCapabilitiesCallback& cb) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| @@ -38,8 +32,7 @@ void RunTakePhotoCallbackOnUIThread(
|
| mojo::Array<uint8_t> data) {
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&RunMojoCallback<void, mojo::String, mojo::Array<uint8_t>>,
|
| - callback, mime_type, base::Passed(std::move(data))));
|
| + base::Bind(callback, mime_type, base::Passed(std::move(data))));
|
| }
|
|
|
| void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) {
|
|
|